Merge remote-tracking branch 'origin/main' into jest-migration/integration-tests

Author: koesie10

extensions/ql-vscode/.storybook/vscode-theme-addon/theme.ts

@@ -1,9 +1,17 @@
 export enum VSCodeTheme {
   Dark = "dark",
   Light = "light",
+  LightHighContrast = "light-high-contrast",
+  DarkHighContrast = "dark-high-contrast",
+  GitHubLightDefault = "github-light-default",
+  GitHubDarkDefault = "github-dark-default",
 }
 
 export const themeNames: { [key in VSCodeTheme]: string } = {
   [VSCodeTheme.Dark]: "Dark+",
   [VSCodeTheme.Light]: "Light+",
+  [VSCodeTheme.LightHighContrast]: "Light High Contrast",
+  [VSCodeTheme.DarkHighContrast]: "Dark High Contrast",
+  [VSCodeTheme.GitHubLightDefault]: "GitHub Light Default",
+  [VSCodeTheme.GitHubDarkDefault]: "GitHub Dark Default",
 };

extensions/ql-vscode/.storybook/vscode-theme-addon/withTheme.ts

@@ -16,6 +16,22 @@ const themeFiles: { [key in VSCodeTheme]: string } = {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     require("!file-loader?modules!../../src/stories/vscode-theme-light.css")
       .default,
+  [VSCodeTheme.LightHighContrast]:
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    require("!file-loader?modules!../../src/stories/vscode-theme-light-high-contrast.css")
+      .default,
+  [VSCodeTheme.DarkHighContrast]:
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    require("!file-loader?modules!../../src/stories/vscode-theme-dark-high-contrast.css")
+      .default,
+  [VSCodeTheme.GitHubLightDefault]:
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    require("!file-loader?modules!../../src/stories/vscode-theme-github-light-default.css")
+      .default,
+  [VSCodeTheme.GitHubDarkDefault]:
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    require("!file-loader?modules!../../src/stories/vscode-theme-github-dark-default.css")
+      .default,
 };
 
 export const withTheme = (

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-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"
   },
@@ -1322,8 +1322,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/package.json

@@ -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/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

@@ -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/queryserver-client.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;