Merge pull request #1662 from github/alexet/update-lsp

Update languageserver-client

extensions/ql-vscode/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [UNRELEASED]
 
+- Required version of VS Code increased to 1.67.0. 
+
 ## 1.7.6 - 21 November 2022
 
 - 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.json

@@ -13,7 +13,7 @@
     "url": "https://github.com/github/vscode-codeql"
   },
   "engines": {
-    "vscode": "^1.59.0",
+    "vscode": "^1.67.0",
     "node": "^16.13.0",
     "npm": ">=7.20.6"
   },
@@ -1321,8 +1321,8 @@
     "tree-kill": "~1.2.2",
     "unzipper": "~0.10.5",
     "vscode-extension-telemetry": "^0.1.6",
-    "vscode-jsonrpc": "^5.0.1",
-    "vscode-languageclient": "^6.1.3",
+    "vscode-jsonrpc": "^8.0.2",
+    "vscode-languageclient": "^8.0.2",
     "vscode-test-adapter-api": "~1.7.0",
     "vscode-test-adapter-util": "~0.7.0",
     "zip-a-folder": "~1.1.3"

extensions/ql-vscode/src/extension.ts

@@ -19,7 +19,7 @@ import {
   ProviderResult,
   version as vscodeVersion,
 } from "vscode";
-import { LanguageClient } from "vscode-languageclient";
+import { LanguageClient } from "vscode-languageclient/node";
 import * as os from "os";
 import * as fs from "fs-extra";
 import * as path from "path";
@@ -1422,8 +1422,12 @@ async function activateWithInstalledDistribution(
   ctx.subscriptions.push(new SummaryLanguageSupport());
 
   void logger.log("Starting language server.");
-  ctx.subscriptions.push(client.start());
-
+  await client.start();
+  ctx.subscriptions.push({
+    dispose: () => {
+      void client.stop();
+    },
+  });
   // Jump-to-definition and find-references
   void logger.log("Registering jump-to-definition handlers.");
 

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

@@ -1,5 +1,5 @@
 import { ProgressLocation, window } from "vscode";
-import { StreamInfo } from "vscode-languageclient";
+import { StreamInfo } from "vscode-languageclient/node";
 import * as cli from "./cli";
 import { QueryServerConfig } from "./config";
 import { ideServerLogger } from "./logging";

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

@@ -3,7 +3,7 @@ import * as fs from "fs-extra";
 
 import { DisposableObject } from "../pure/disposable-object";
 import { CancellationToken, commands } from "vscode";
-import { createMessageConnection, RequestType } from "vscode-jsonrpc";
+import { createMessageConnection, RequestType } from "vscode-jsonrpc/node";
 import * as cli from "../cli";
 import { QueryServerConfig } from "../config";
 import { Logger, ProgressReporter } from "../logging";
@@ -237,8 +237,8 @@ export class QueryServerClient extends DisposableObject {
     return this.serverProcess!.child.pid || 0;
   }
 
-  async sendRequest<P, R, E, RO>(
-    type: RequestType<WithProgressId<P>, R, E, RO>,
+  async sendRequest<P, R, E>(
+    type: RequestType<WithProgressId<P>, R, E>,
     parameter: P,
     token?: CancellationToken,
     progress?: (res: ProgressMessage) => void,

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

@@ -3,7 +3,7 @@ import * as fs from "fs-extra";
 import * as tmp from "tmp-promise";
 import * as path from "path";
 import { CancellationToken, Uri } from "vscode";
-import { ErrorCodes, ResponseError } from "vscode-languageclient";
+import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
 
 import * as cli from "../cli";
 import { DatabaseItem } from "../databases";
@@ -480,7 +480,10 @@ export async function compileAndRunQueryAgainstDatabase(
     try {
       errors = await query.compile(qs, qlProgram, progress, token);
     } catch (e) {
-      if (e instanceof ResponseError && e.code == ErrorCodes.RequestCancelled) {
+      if (
+        e instanceof ResponseError &&
+        e.code == LSPErrorCodes.RequestCancelled
+      ) {
         return createSyntheticResult(query, "Query cancelled");
       } else {
         throw e;

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

@@ -973,7 +973,6 @@ export type ProgressMessage = shared.ProgressMessage;
 export const checkQuery = new rpc.RequestType<
   WithProgressId<CheckQueryParams>,
   CheckQueryResult,
-  void,
   void
 >("compilation/checkQuery");
 /**
@@ -982,7 +981,6 @@ export const checkQuery = new rpc.RequestType<
 export const compileQuery = new rpc.RequestType<
   WithProgressId<CompileQueryParams>,
   CheckQueryResult,
-  void,
   void
 >("compilation/compileQuery");
 /**
@@ -991,7 +989,6 @@ export const compileQuery = new rpc.RequestType<
 export const compileDilQuery = new rpc.RequestType<
   WithProgressId<CompileDilParams>,
   CheckQueryResult,
-  void,
   void
 >("compilation/compileDilQuery");
 
@@ -1001,7 +998,6 @@ export const compileDilQuery = new rpc.RequestType<
 export const checkUpgrade = new rpc.RequestType<
   WithProgressId<UpgradeParams>,
   CheckUpgradeResult,
-  void,
   void
 >("compilation/checkUpgrade");
 /**
@@ -1010,7 +1006,6 @@ export const checkUpgrade = new rpc.RequestType<
 export const compileUpgrade = new rpc.RequestType<
   WithProgressId<CompileUpgradeParams>,
   CompileUpgradeResult,
-  void,
   void
 >("compilation/compileUpgrade");
 /**
@@ -1019,7 +1014,6 @@ export const compileUpgrade = new rpc.RequestType<
 export const compileUpgradeSequence = new rpc.RequestType<
   WithProgressId<CompileUpgradeSequenceParams>,
   CompileUpgradeSequenceResult,
-  void,
   void
 >("compilation/compileUpgradeSequence");
 
@@ -1029,7 +1023,6 @@ export const compileUpgradeSequence = new rpc.RequestType<
 export const startLog = new rpc.RequestType<
   WithProgressId<StartLogParams>,
   StartLogResult,
-  void,
   void
 >("evaluation/startLog");
 
@@ -1039,7 +1032,6 @@ export const startLog = new rpc.RequestType<
 export const endLog = new rpc.RequestType<
   WithProgressId<EndLogParams>,
   EndLogResult,
-  void,
   void
 >("evaluation/endLog");
 
@@ -1049,7 +1041,6 @@ export const endLog = new rpc.RequestType<
 export const clearCache = new rpc.RequestType<
   WithProgressId<ClearCacheParams>,
   ClearCacheResult,
-  void,
   void
 >("evaluation/clearCache");
 /**
@@ -1058,7 +1049,6 @@ export const clearCache = new rpc.RequestType<
 export const trimCache = new rpc.RequestType<
   WithProgressId<TrimCacheParams>,
   ClearCacheResult,
-  void,
   void
 >("evaluation/trimCache");
 
@@ -1068,7 +1058,6 @@ export const trimCache = new rpc.RequestType<
 export const runQueries = new rpc.RequestType<
   WithProgressId<EvaluateQueriesParams>,
   EvaluationComplete,
-  void,
   void
 >("evaluation/runQueries");
 
@@ -1078,21 +1067,18 @@ export const runQueries = new rpc.RequestType<
 export const runUpgrade = new rpc.RequestType<
   WithProgressId<RunUpgradeParams>,
   RunUpgradeResult,
-  void,
   void
 >("evaluation/runUpgrade");
 
 export const registerDatabases = new rpc.RequestType<
   WithProgressId<RegisterDatabasesParams>,
   RegisterDatabasesResult,
-  void,
   void
 >("evaluation/registerDatabases");
 
 export const deregisterDatabases = new rpc.RequestType<
   WithProgressId<DeregisterDatabasesParams>,
   DeregisterDatabasesResult,
-  void,
   void
 >("evaluation/deregisterDatabases");
 
@@ -1103,7 +1089,6 @@ export const deregisterDatabases = new rpc.RequestType<
 export const completeQuery = new rpc.RequestType<
   EvaluationResult,
   Record<string, any>,
-  void,
   void
 >("evaluation/queryCompleted");
 

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

@@ -106,6 +106,6 @@ export interface ProgressMessage {
 /**
  * A notification that the progress has been changed.
  */
-export const progress = new rpc.NotificationType<ProgressMessage, void>(
+export const progress = new rpc.NotificationType<ProgressMessage>(
   "ql/progressUpdated",
 );