Remove command manager argument to variant analysis view

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

@@ -62,7 +62,10 @@ import { URLSearchParams } from "url";
 import { DbManager } from "../databases/db-manager";
 import { App } from "../common/app";
 import { redactableError } from "../pure/errors";
-import { VariantAnalysisCommands } from "../common/commands";
+import {
+  ExtensionCommandManager,
+  VariantAnalysisCommands,
+} from "../common/commands";
 
 export class VariantAnalysisManager
   extends DisposableObject
@@ -132,6 +135,10 @@ export class VariantAnalysisManager
     };
   }
 
+  get commandManager(): ExtensionCommandManager {
+    return this.app.commandManager;
+  }
+
   public async runVariantAnalysis(
     uri: Uri | undefined,
     progress: ProgressCallback,
@@ -277,14 +284,7 @@ export class VariantAnalysisManager
     }
     if (!this.views.has(variantAnalysisId)) {
       // The view will register itself with the manager, so we don't need to do anything here.
-      this.track(
-        new VariantAnalysisView(
-          this.ctx,
-          this.app.commandManager,
-          variantAnalysisId,
-          this,
-        ),
-      );
+      this.track(new VariantAnalysisView(this.ctx, variantAnalysisId, this));
     }
 
     const variantAnalysisView = this.views.get(variantAnalysisId)!;

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

@@ -2,6 +2,7 @@ import {
   VariantAnalysis,
   VariantAnalysisScannedRepositoryState,
 } from "./shared/variant-analysis";
+import { ExtensionCommandManager } from "../common/commands";
 
 export interface VariantAnalysisViewInterface {
   variantAnalysisId: number;
@@ -11,6 +12,8 @@ export interface VariantAnalysisViewInterface {
 export interface VariantAnalysisViewManager<
   T extends VariantAnalysisViewInterface,
 > {
+  commandManager: ExtensionCommandManager;
+
   registerView(view: T): void;
   unregisterView(view: T): void;
   getView(variantAnalysisId: number): T | undefined;

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

@@ -17,7 +17,6 @@ import {
 } from "./variant-analysis-view-manager";
 import { showAndLogWarningMessage } from "../helpers";
 import { telemetryListener } from "../telemetry";
-import { ExtensionCommandManager } from "../common/commands";
 
 export class VariantAnalysisView
   extends AbstractWebview<ToVariantAnalysisMessage, FromVariantAnalysisMessage>
@@ -27,7 +26,6 @@ export class VariantAnalysisView
 
   public constructor(
     ctx: ExtensionContext,
-    private readonly commandManager: ExtensionCommandManager,
     public readonly variantAnalysisId: number,
     private readonly manager: VariantAnalysisViewManager<VariantAnalysisView>,
   ) {
@@ -147,7 +145,7 @@ export class VariantAnalysisView
         );
         break;
       case "openLogs":
-        await this.commandManager.executeCommand(
+        await this.manager.commandManager.executeCommand(
           "codeQL.openVariantAnalysisLogs",
           this.variantAnalysisId,
         );