Merge pull request #2204 from github/koesie10/summary-language-support-typed-commands

Convert summary language commands to typed commands

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

@@ -191,6 +191,10 @@ export type EvalLogViewerCommands = {
   "codeQLEvalLogViewer.clear": () => Promise<void>;
 };
 
+export type SummaryLanguageSupportCommands = {
+  "codeQL.gotoQL": () => Promise<void>;
+};
+
 export type AllCommands = BaseCommands &
   QueryHistoryCommands &
   LocalDatabasesCommands &
@@ -199,7 +203,8 @@ export type AllCommands = BaseCommands &
   AstCfgCommands &
   AstViewerCommands &
   PackagingCommands &
-  EvalLogViewerCommands;
+  EvalLogViewerCommands &
+  SummaryLanguageSupportCommands;
 
 export type AppCommandManager = CommandManager<AllCommands>;
 

extensions/ql-vscode/src/extension.ts

@@ -819,6 +819,9 @@ async function activateWithInstalledDistribution(
 
   ctx.subscriptions.push(astViewer);
 
+  const summaryLanguageSupport = new SummaryLanguageSupport();
+  ctx.subscriptions.push(summaryLanguageSupport);
+
   void extLogger.log("Registering top-level command palette commands.");
 
   const allCommands: AllCommands = {
@@ -842,6 +845,7 @@ async function activateWithInstalledDistribution(
       cliServer,
     }),
     ...evalLogViewer.getCommands(),
+    ...summaryLanguageSupport.getCommands(),
   };
 
   for (const [commandName, command] of Object.entries(allCommands)) {
@@ -938,8 +942,6 @@ async function activateWithInstalledDistribution(
     }),
   );
 
-  ctx.subscriptions.push(new SummaryLanguageSupport());
-
   void extLogger.log("Starting language server.");
   await client.start();
   ctx.subscriptions.push({

extensions/ql-vscode/src/log-insights/summary-language-support.ts

@@ -13,9 +13,9 @@ import {
   workspace,
 } from "vscode";
 import { DisposableObject } from "../pure/disposable-object";
-import { commandRunner } from "../commandRunner";
 import { extLogger } from "../common";
 import { getErrorMessage } from "../pure/helpers-pure";
+import { SummaryLanguageSupportCommands } from "../common/commands";
 
 /** A `Position` within a specified file on disk. */
 interface PositionInFile {
@@ -73,8 +73,12 @@ export class SummaryLanguageSupport extends DisposableObject {
         this.handleDidCloseTextDocument.bind(this),
       ),
     );
+  }
 
-    this.push(commandRunner("codeQL.gotoQL", this.handleGotoQL.bind(this)));
+  public getCommands(): SummaryLanguageSupportCommands {
+    return {
+      "codeQL.gotoQL": this.handleGotoQL.bind(this),
+    };
   }
 
   /**