Remove codeQL.cancelVariantAnalysis command

Author: robertbrignull

extensions/ql-vscode/src/extension.ts

@@ -1145,15 +1145,6 @@ async function activateWithInstalledDistribution(
     ),
   );
 
-  ctx.subscriptions.push(
-    commandRunner(
-      "codeQL.cancelVariantAnalysis",
-      async (variantAnalysisId: number) => {
-        await variantAnalysisManager.cancelVariantAnalysis(variantAnalysisId);
-      },
-    ),
-  );
-
   ctx.subscriptions.push(
     commandRunner("codeQL.exportSelectedVariantAnalysisResults", async () => {
       await exportSelectedVariantAnalysisResults(qhm);

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -1008,8 +1008,7 @@ export class QueryHistoryManager extends DisposableObject {
         if (item.t === "local") {
           item.cancel();
         } else if (item.t === "variant-analysis") {
-          await commands.executeCommand(
-            "codeQL.cancelVariantAnalysis",
+          await this.variantAnalysisManager.cancelVariantAnalysis(
             item.variantAnalysis.id,
           );
         } else {

extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts

@@ -25,4 +25,5 @@ export interface VariantAnalysisViewManager<
     variantAnalysisId: number,
   ): Promise<VariantAnalysisScannedRepositoryState[]>;
   openQueryFile(variantAnalysisId: number): Promise<void>;
+  cancelVariantAnalysis(variantAnalysisId: number): Promise<void>;
 }

extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts

@@ -110,10 +110,7 @@ export class VariantAnalysisView
 
         break;
       case "cancelVariantAnalysis":
-        void commands.executeCommand(
-          "codeQL.cancelVariantAnalysis",
-          this.variantAnalysisId,
-        );
+        await this.manager.cancelVariantAnalysis(this.variantAnalysisId);
         break;
       case "requestRepositoryResults":
         void commands.executeCommand(

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx

@@ -38,6 +38,7 @@ const stopQuery = () => {
   vscode.postMessage({
     t: "cancelVariantAnalysis",
   });
+  sendTelemetry("variant-analysis-cancel");
 };
 
 const openLogs = () => {

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts

@@ -41,6 +41,9 @@ describe("QueryHistoryManager", () => {
   let executeCommandSpy: jest.SpiedFunction<
     typeof vscode.commands.executeCommand
   >;
+  let cancelVariantAnalysisSpy: jest.SpiedFunction<
+    typeof variantAnalysisManagerStub.cancelVariantAnalysis
+  >;
   const doCompareCallback = jest.fn();
 
   let queryHistoryManager: QueryHistoryManager;
@@ -82,9 +85,14 @@ describe("QueryHistoryManager", () => {
       onVariantAnalysisStatusUpdated: jest.fn(),
       onVariantAnalysisRemoved: jest.fn(),
       removeVariantAnalysis: jest.fn(),
+      cancelVariantAnalysis: jest.fn(),
       showView: jest.fn(),
     } as any as VariantAnalysisManager;
 
+    cancelVariantAnalysisSpy = jest
+      .spyOn(variantAnalysisManagerStub, "cancelVariantAnalysis")
+      .mockResolvedValue(undefined);
+
     localQueryHistory = [
       // completed
       createMockLocalQueryInfo({
@@ -729,8 +737,7 @@ describe("QueryHistoryManager", () => {
         const inProgress1 = variantAnalysisHistory[1];
 
         await queryHistoryManager.handleCancel(inProgress1, [inProgress1]);
-        expect(executeCommandSpy).toBeCalledWith(
-          "codeQL.cancelVariantAnalysis",
+        expect(cancelVariantAnalysisSpy).toBeCalledWith(
           inProgress1.variantAnalysis.id,
         );
       });
@@ -746,12 +753,10 @@ describe("QueryHistoryManager", () => {
           inProgress1,
           inProgress2,
         ]);
-        expect(executeCommandSpy).toBeCalledWith(
-          "codeQL.cancelVariantAnalysis",
+        expect(cancelVariantAnalysisSpy).toBeCalledWith(
           inProgress1.variantAnalysis.id,
         );
-        expect(executeCommandSpy).toBeCalledWith(
-          "codeQL.cancelVariantAnalysis",
+        expect(cancelVariantAnalysisSpy).toBeCalledWith(
           inProgress2.variantAnalysis.id,
         );
       });
@@ -793,8 +798,7 @@ describe("QueryHistoryManager", () => {
         await queryHistoryManager.handleCancel(completedVariantAnalysis, [
           completedVariantAnalysis,
         ]);
-        expect(executeCommandSpy).not.toBeCalledWith(
-          "codeQL.cancelVariantAnalysis",
+        expect(cancelVariantAnalysisSpy).not.toBeCalledWith(
           completedVariantAnalysis.variantAnalysis,
         );
       });
@@ -810,12 +814,10 @@ describe("QueryHistoryManager", () => {
           completedVariantAnalysis,
           failedVariantAnalysis,
         ]);
-        expect(executeCommandSpy).not.toBeCalledWith(
-          "codeQL.cancelVariantAnalysis",
+        expect(cancelVariantAnalysisSpy).not.toBeCalledWith(
           completedVariantAnalysis.variantAnalysis.id,
         );
-        expect(executeCommandSpy).not.toBeCalledWith(
-          "codeQL.cancelVariantAnalysis",
+        expect(cancelVariantAnalysisSpy).not.toBeCalledWith(
           failedVariantAnalysis.variantAnalysis.id,
         );
       });