Merge branch 'main' into robertbrignull/splitCommand/codeQL.monitorVariantAnalysis

extensions/ql-vscode/src/common/commands.ts

@@ -69,6 +69,8 @@ export type BaseCommands = {
 
   "codeQL.copyVersion": () => Promise<void>;
   "codeQL.restartQueryServer": () => Promise<void>;
+  "codeQL.restartQueryServerOnConfigChange": () => Promise<void>;
+  "codeQL.restartLegacyQueryServerOnConfigChange": () => Promise<void>;
 };
 
 // Commands used when working with queries in the editor

extensions/ql-vscode/src/extension.ts

@@ -169,27 +169,31 @@ function getCommands(
     }
   };
 
+  const restartQueryServer = async () =>
+    withProgress(
+      async (progress: ProgressCallback, token: CancellationToken) => {
+        // Restart all of the spawned servers: cli, query, and language.
+        cliServer.restartCliServer();
+        await Promise.all([
+          queryRunner.restartQueryServer(progress, token),
+          ideServer.restart(),
+        ]);
+        void showAndLogInformationMessage("CodeQL Query Server restarted.", {
+          outputLogger: queryServerLogger,
+        });
+      },
+      {
+        title: "Restarting Query Server",
+      },
+    );
+
   return {
     "codeQL.openDocumentation": async () => {
       await env.openExternal(Uri.parse("https://codeql.github.com/docs/"));
     },
-    "codeQL.restartQueryServer": async () =>
-      withProgress(
-        async (progress: ProgressCallback, token: CancellationToken) => {
-          // Restart all of the spawned servers: cli, query, and language.
-          cliServer.restartCliServer();
-          await Promise.all([
-            queryRunner.restartQueryServer(progress, token),
-            ideServer.restart(),
-          ]);
-          void showAndLogInformationMessage("CodeQL Query Server restarted.", {
-            outputLogger: queryServerLogger,
-          });
-        },
-        {
-          title: "Restarting Query Server",
-        },
-      ),
+    "codeQL.restartQueryServer": restartQueryServer,
+    "codeQL.restartQueryServerOnConfigChange": restartQueryServer,
+    "codeQL.restartLegacyQueryServerOnConfigChange": restartQueryServer,
     "codeQL.copyVersion": async () => {
       const text = `CodeQL extension version: ${
         extension?.packageJSON.version

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

@@ -71,7 +71,7 @@ export class QueryServerClient extends DisposableObject {
     if (config.onDidChangeConfiguration !== undefined) {
       this.push(
         config.onDidChangeConfiguration(() =>
-          app.commands.execute("codeQL.restartQueryServer"),
+          app.commands.execute("codeQL.restartLegacyQueryServerOnConfigChange"),
         ),
       );
     }

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

@@ -68,7 +68,7 @@ export class QueryServerClient extends DisposableObject {
     if (config.onDidChangeConfiguration !== undefined) {
       this.push(
         config.onDidChangeConfiguration(() =>
-          app.commands.execute("codeQL.restartQueryServer"),
+          app.commands.execute("codeQL.restartQueryServerOnConfigChange"),
         ),
       );
     }

extensions/ql-vscode/supported_cli_versions.json

@@ -1,5 +1,5 @@
 [
-  "v2.12.5",
+  "v2.12.6",
   "v2.11.6",
   "v2.7.6",
   "v2.8.5",