Skip to content

Commit d8bbd3d

Browse files
committed
Fix faulty import
During the build process, we now get errors pointing out that we import two different items and call them `QueryServerClient`. One is actually the legacy one and has been superseded by the new one so far. Let's fix this and appease the linter. Full errors: ``` [gulp-typescript] /home/runner/work/vscode-codeql/vscode-codeql/extensions/ql-vscode/src/extension.ts(88,9): error TS2300: Duplicate identifier 'QueryServerClient'. [gulp-typescript] /home/runner/work/vscode-codeql/vscode-codeql/extensions/ql-vscode/src/extension.ts(89,9): error TS2300: Duplicate identifier 'QueryServerClient'. [gulp-typescript] /home/runner/work/vscode-codeql/vscode-codeql/extensions/ql-vscode/src/extension.ts(1596,30): error TS2345: Argument of type 'import("/home/runner/work/vscode-codeql/vscode-codeql/extensions/ql-vscode/src/legacy-query-server/queryserver-client").QueryServerClient' is not assignable to parameter of type 'import("/home/runner/work/vscode-codeql/vscode-codeql/extensions/ql-vscode/src/query-server/queryserver-client").QueryServerClient'. ```
1 parent 99bb04b commit d8bbd3d

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

extensions/ql-vscode/src/extension.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ import {
8585
} from "./common";
8686
import { QueryHistoryManager } from "./query-history";
8787
import { CompletedLocalQueryInfo, LocalQueryInfo } from "./query-results";
88-
import { QueryServerClient } from "./legacy-query-server/queryserver-client";
88+
import { QueryServerClient as LegacyQueryServerClient } from "./legacy-query-server/queryserver-client";
8989
import { QueryServerClient } from "./query-server/queryserver-client";
9090
import { displayQuickQuery } from "./quick-query";
9191
import { QLTestAdapterFactory } from "./test-adapter";
@@ -1604,7 +1604,7 @@ async function createQueryServer(
16041604
await qs.startQueryServer();
16051605
return new NewQueryRunner(qs);
16061606
} else {
1607-
const qs = new QueryServerClient(
1607+
const qs = new LegacyQueryServerClient(
16081608
qlConfigurationListener,
16091609
cliServer,
16101610
qsOpts,

0 commit comments

Comments
 (0)