Skip to content

Commit 91edad8

Browse files
authored
Merge pull request #1662 from github/alexet/update-lsp
Update languageserver-client
2 parents e6fb480 + 2637d6d commit 91edad8

File tree

12 files changed

+69
-92
lines changed

12 files changed

+69
-92
lines changed

extensions/ql-vscode/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## [UNRELEASED]
44

5+
- Required version of VS Code increased to 1.67.0.
6+
57
## 1.7.6 - 21 November 2022
68

79
- Warn users when their VS Code version is too old to support all features in the vscode-codeql extension. [#1674](https://github.com/github/vscode-codeql/pull/1674)

extensions/ql-vscode/package-lock.json

Lines changed: 39 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/ql-vscode/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"url": "https://github.com/github/vscode-codeql"
1414
},
1515
"engines": {
16-
"vscode": "^1.59.0",
16+
"vscode": "^1.67.0",
1717
"node": "^16.13.0",
1818
"npm": ">=7.20.6"
1919
},
@@ -1321,8 +1321,8 @@
13211321
"tree-kill": "~1.2.2",
13221322
"unzipper": "~0.10.5",
13231323
"vscode-extension-telemetry": "^0.1.6",
1324-
"vscode-jsonrpc": "^5.0.1",
1325-
"vscode-languageclient": "^6.1.3",
1324+
"vscode-jsonrpc": "^8.0.2",
1325+
"vscode-languageclient": "^8.0.2",
13261326
"vscode-test-adapter-api": "~1.7.0",
13271327
"vscode-test-adapter-util": "~0.7.0",
13281328
"zip-a-folder": "~1.1.3"

extensions/ql-vscode/src/extension.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
ProviderResult,
2020
version as vscodeVersion,
2121
} from "vscode";
22-
import { LanguageClient } from "vscode-languageclient";
22+
import { LanguageClient } from "vscode-languageclient/node";
2323
import * as os from "os";
2424
import * as fs from "fs-extra";
2525
import * as path from "path";
@@ -1422,8 +1422,12 @@ async function activateWithInstalledDistribution(
14221422
ctx.subscriptions.push(new SummaryLanguageSupport());
14231423

14241424
void logger.log("Starting language server.");
1425-
ctx.subscriptions.push(client.start());
1426-
1425+
await client.start();
1426+
ctx.subscriptions.push({
1427+
dispose: () => {
1428+
void client.stop();
1429+
},
1430+
});
14271431
// Jump-to-definition and find-references
14281432
void logger.log("Registering jump-to-definition handlers.");
14291433

extensions/ql-vscode/src/ide-server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ProgressLocation, window } from "vscode";
2-
import { StreamInfo } from "vscode-languageclient";
2+
import { StreamInfo } from "vscode-languageclient/node";
33
import * as cli from "./cli";
44
import { QueryServerConfig } from "./config";
55
import { ideServerLogger } from "./logging";

extensions/ql-vscode/src/legacy-query-server/queryserver-client.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as fs from "fs-extra";
33

44
import { DisposableObject } from "../pure/disposable-object";
55
import { CancellationToken, commands } from "vscode";
6-
import { createMessageConnection, RequestType } from "vscode-jsonrpc";
6+
import { createMessageConnection, RequestType } from "vscode-jsonrpc/node";
77
import * as cli from "../cli";
88
import { QueryServerConfig } from "../config";
99
import { Logger, ProgressReporter } from "../logging";
@@ -237,8 +237,8 @@ export class QueryServerClient extends DisposableObject {
237237
return this.serverProcess!.child.pid || 0;
238238
}
239239

240-
async sendRequest<P, R, E, RO>(
241-
type: RequestType<WithProgressId<P>, R, E, RO>,
240+
async sendRequest<P, R, E>(
241+
type: RequestType<WithProgressId<P>, R, E>,
242242
parameter: P,
243243
token?: CancellationToken,
244244
progress?: (res: ProgressMessage) => void,

extensions/ql-vscode/src/legacy-query-server/run-queries.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as fs from "fs-extra";
33
import * as tmp from "tmp-promise";
44
import * as path from "path";
55
import { CancellationToken, Uri } from "vscode";
6-
import { ErrorCodes, ResponseError } from "vscode-languageclient";
6+
import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
77

88
import * as cli from "../cli";
99
import { DatabaseItem } from "../databases";
@@ -480,7 +480,10 @@ export async function compileAndRunQueryAgainstDatabase(
480480
try {
481481
errors = await query.compile(qs, qlProgram, progress, token);
482482
} catch (e) {
483-
if (e instanceof ResponseError && e.code == ErrorCodes.RequestCancelled) {
483+
if (
484+
e instanceof ResponseError &&
485+
e.code == LSPErrorCodes.RequestCancelled
486+
) {
484487
return createSyntheticResult(query, "Query cancelled");
485488
} else {
486489
throw e;

extensions/ql-vscode/src/pure/legacy-messages.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,6 @@ export type ProgressMessage = shared.ProgressMessage;
973973
export const checkQuery = new rpc.RequestType<
974974
WithProgressId<CheckQueryParams>,
975975
CheckQueryResult,
976-
void,
977976
void
978977
>("compilation/checkQuery");
979978
/**
@@ -982,7 +981,6 @@ export const checkQuery = new rpc.RequestType<
982981
export const compileQuery = new rpc.RequestType<
983982
WithProgressId<CompileQueryParams>,
984983
CheckQueryResult,
985-
void,
986984
void
987985
>("compilation/compileQuery");
988986
/**
@@ -991,7 +989,6 @@ export const compileQuery = new rpc.RequestType<
991989
export const compileDilQuery = new rpc.RequestType<
992990
WithProgressId<CompileDilParams>,
993991
CheckQueryResult,
994-
void,
995992
void
996993
>("compilation/compileDilQuery");
997994

@@ -1001,7 +998,6 @@ export const compileDilQuery = new rpc.RequestType<
1001998
export const checkUpgrade = new rpc.RequestType<
1002999
WithProgressId<UpgradeParams>,
10031000
CheckUpgradeResult,
1004-
void,
10051001
void
10061002
>("compilation/checkUpgrade");
10071003
/**
@@ -1010,7 +1006,6 @@ export const checkUpgrade = new rpc.RequestType<
10101006
export const compileUpgrade = new rpc.RequestType<
10111007
WithProgressId<CompileUpgradeParams>,
10121008
CompileUpgradeResult,
1013-
void,
10141009
void
10151010
>("compilation/compileUpgrade");
10161011
/**
@@ -1019,7 +1014,6 @@ export const compileUpgrade = new rpc.RequestType<
10191014
export const compileUpgradeSequence = new rpc.RequestType<
10201015
WithProgressId<CompileUpgradeSequenceParams>,
10211016
CompileUpgradeSequenceResult,
1022-
void,
10231017
void
10241018
>("compilation/compileUpgradeSequence");
10251019

@@ -1029,7 +1023,6 @@ export const compileUpgradeSequence = new rpc.RequestType<
10291023
export const startLog = new rpc.RequestType<
10301024
WithProgressId<StartLogParams>,
10311025
StartLogResult,
1032-
void,
10331026
void
10341027
>("evaluation/startLog");
10351028

@@ -1039,7 +1032,6 @@ export const startLog = new rpc.RequestType<
10391032
export const endLog = new rpc.RequestType<
10401033
WithProgressId<EndLogParams>,
10411034
EndLogResult,
1042-
void,
10431035
void
10441036
>("evaluation/endLog");
10451037

@@ -1049,7 +1041,6 @@ export const endLog = new rpc.RequestType<
10491041
export const clearCache = new rpc.RequestType<
10501042
WithProgressId<ClearCacheParams>,
10511043
ClearCacheResult,
1052-
void,
10531044
void
10541045
>("evaluation/clearCache");
10551046
/**
@@ -1058,7 +1049,6 @@ export const clearCache = new rpc.RequestType<
10581049
export const trimCache = new rpc.RequestType<
10591050
WithProgressId<TrimCacheParams>,
10601051
ClearCacheResult,
1061-
void,
10621052
void
10631053
>("evaluation/trimCache");
10641054

@@ -1068,7 +1058,6 @@ export const trimCache = new rpc.RequestType<
10681058
export const runQueries = new rpc.RequestType<
10691059
WithProgressId<EvaluateQueriesParams>,
10701060
EvaluationComplete,
1071-
void,
10721061
void
10731062
>("evaluation/runQueries");
10741063

@@ -1078,21 +1067,18 @@ export const runQueries = new rpc.RequestType<
10781067
export const runUpgrade = new rpc.RequestType<
10791068
WithProgressId<RunUpgradeParams>,
10801069
RunUpgradeResult,
1081-
void,
10821070
void
10831071
>("evaluation/runUpgrade");
10841072

10851073
export const registerDatabases = new rpc.RequestType<
10861074
WithProgressId<RegisterDatabasesParams>,
10871075
RegisterDatabasesResult,
1088-
void,
10891076
void
10901077
>("evaluation/registerDatabases");
10911078

10921079
export const deregisterDatabases = new rpc.RequestType<
10931080
WithProgressId<DeregisterDatabasesParams>,
10941081
DeregisterDatabasesResult,
1095-
void,
10961082
void
10971083
>("evaluation/deregisterDatabases");
10981084

@@ -1103,7 +1089,6 @@ export const deregisterDatabases = new rpc.RequestType<
11031089
export const completeQuery = new rpc.RequestType<
11041090
EvaluationResult,
11051091
Record<string, any>,
1106-
void,
11071092
void
11081093
>("evaluation/queryCompleted");
11091094

extensions/ql-vscode/src/pure/messages-shared.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@ export interface ProgressMessage {
106106
/**
107107
* A notification that the progress has been changed.
108108
*/
109-
export const progress = new rpc.NotificationType<ProgressMessage, void>(
109+
export const progress = new rpc.NotificationType<ProgressMessage>(
110110
"ql/progressUpdated",
111111
);

0 commit comments

Comments
 (0)