Update languageserver-client

Author: Alexander Eyers-Taylor

extensions/ql-vscode/package-lock.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"
   },
@@ -1296,7 +1296,7 @@
     "unzipper": "~0.10.5",
     "vscode-extension-telemetry": "^0.1.6",
     "vscode-jsonrpc": "^5.0.1",
-    "vscode-languageclient": "^6.1.3",
+    "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/package.json

@@ -18,7 +18,7 @@ import {
   workspace,
   ProviderResult
 } 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';
@@ -1130,8 +1130,10 @@ 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/extension.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/ide-server.ts

@@ -6,7 +6,7 @@ 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';
@@ -400,7 +400,7 @@ 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/legacy-query-server/run-queries.ts

@@ -8,7 +8,7 @@ import {
   workspace,
   Uri
 } from 'vscode';
-import { ErrorCodes, ResponseError } from 'vscode-languageclient';
+import { LSPErrorCodes, ResponseError } from 'vscode-languageclient';
 import { CodeQLCliServer } from './cli';
 import { DatabaseUI } from './databases-ui';
 import {
@@ -139,7 +139,7 @@ export async function displayQuickQuery(
 
     await Window.showTextDocument(await workspace.openTextDocument(qlFile));
   } catch (e) {
-    if (e instanceof ResponseError && e.code == ErrorCodes.RequestCancelled) {
+    if (e instanceof ResponseError && e.code == LSPErrorCodes.RequestCancelled) {
       throw new UserCancellationException(getErrorMessage(e));
     } else {
       throw e;