Merge pull request #2272 from github/robertbrignull/splitCommand/codeQL.monitorVariantAnalysis

Split up codeQL.monitorVariantAnalysis command

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

@@ -198,7 +198,10 @@ export type VariantAnalysisCommands = {
     variantAnalysisId: number,
     repositoryFullName: string,
   ) => Promise<VariantAnalysisScannedRepositoryResult>;
-  "codeQL.monitorVariantAnalysis": (
+  "codeQL.monitorNewVariantAnalysis": (
+    variantAnalysis: VariantAnalysis,
+  ) => Promise<void>;
+  "codeQL.monitorRehydratedVariantAnalysis": (
     variantAnalysis: VariantAnalysis,
   ) => Promise<void>;
   "codeQL.openVariantAnalysisLogs": (

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

@@ -140,7 +140,10 @@ export class VariantAnalysisManager
       "codeQL.copyVariantAnalysisRepoList":
         this.copyRepoListToClipboard.bind(this),
       "codeQL.loadVariantAnalysisRepoResults": this.loadResults.bind(this),
-      "codeQL.monitorVariantAnalysis": this.monitorVariantAnalysis.bind(this),
+      "codeQL.monitorNewVariantAnalysis":
+        this.monitorVariantAnalysis.bind(this),
+      "codeQL.monitorRehydratedVariantAnalysis":
+        this.monitorVariantAnalysis.bind(this),
       "codeQL.openVariantAnalysisLogs": this.openVariantAnalysisLogs.bind(this),
       "codeQL.openVariantAnalysisView": this.showView.bind(this),
       "codeQL.runVariantAnalysis":
@@ -248,7 +251,7 @@ export class VariantAnalysisManager
       processedVariantAnalysis.id,
     );
     void this.app.commands.execute(
-      "codeQL.monitorVariantAnalysis",
+      "codeQL.monitorNewVariantAnalysis",
       processedVariantAnalysis,
     );
   }
@@ -278,7 +281,7 @@ export class VariantAnalysisManager
         ))
       ) {
         void this.app.commands.execute(
-          "codeQL.monitorVariantAnalysis",
+          "codeQL.monitorRehydratedVariantAnalysis",
           variantAnalysis,
         );
       }

extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts

@@ -516,7 +516,7 @@ describe("Variant Analysis Manager", () => {
             variantAnalysis,
           );
           expect(executeCommandSpy).toHaveBeenCalledWith(
-            "codeQL.monitorVariantAnalysis",
+            "codeQL.monitorRehydratedVariantAnalysis",
             expect.anything(),
           );
         });

extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts

@@ -128,7 +128,7 @@ describe("Variant Analysis Manager", () => {
       );
 
       expect(executeCommandSpy).toBeCalledWith(
-        "codeQL.monitorVariantAnalysis",
+        "codeQL.monitorNewVariantAnalysis",
         expect.objectContaining({
           id: mockApiResponse.id,
           status: VariantAnalysisStatus.InProgress,
@@ -149,7 +149,7 @@ describe("Variant Analysis Manager", () => {
       );
 
       expect(executeCommandSpy).toBeCalledWith(
-        "codeQL.monitorVariantAnalysis",
+        "codeQL.monitorNewVariantAnalysis",
         expect.objectContaining({
           id: mockApiResponse.id,
           status: VariantAnalysisStatus.InProgress,
@@ -170,7 +170,7 @@ describe("Variant Analysis Manager", () => {
       );
 
       expect(executeCommandSpy).toBeCalledWith(
-        "codeQL.monitorVariantAnalysis",
+        "codeQL.monitorNewVariantAnalysis",
         expect.objectContaining({
           id: mockApiResponse.id,
           status: VariantAnalysisStatus.InProgress,
@@ -293,7 +293,7 @@ describe("Variant Analysis Manager", () => {
 
       expect(mockSubmitVariantAnalysis).toBeCalledTimes(1);
       expect(executeCommandSpy).toBeCalledWith(
-        "codeQL.monitorVariantAnalysis",
+        "codeQL.monitorNewVariantAnalysis",
         expect.objectContaining({
           query: expect.objectContaining({ filePath: fileUri.fsPath }),
         }),