Update canary setting to allow for immediate toggle of button when variant analysis panel is open instead of needing to open/close for the setting change to take affect. (copilot)

Author: Jami Cogswell

extensions/ql-vscode/src/common/interface-types.ts

@@ -496,6 +496,11 @@ interface SetVariantAnalysisMessage {
   isCanary?: boolean;
 }
 
+interface SetCanaryStatusMessage {
+  t: "setCanaryStatus";
+  isCanary: boolean;
+}
+
 interface SetFilterSortStateMessage {
   t: "setFilterSortState";
   filterSortState: RepositoriesFilterSortState;
@@ -560,7 +565,8 @@ export type ToVariantAnalysisMessage =
   | SetVariantAnalysisMessage
   | SetFilterSortStateMessage
   | SetRepoResultsMessage
-  | SetRepoStatesMessage;
+  | SetRepoStatesMessage
+  | SetCanaryStatusMessage;
 
 export type FromVariantAnalysisMessage =
   | CommonFromViewMessages

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

@@ -1,4 +1,5 @@
-import { ViewColumn } from "vscode";
+import type { ConfigurationChangeEvent } from "vscode";
+import { ViewColumn, workspace } from "vscode";
 import type { WebviewPanelConfig } from "../common/vscode/abstract-webview";
 import { AbstractWebview } from "../common/vscode/abstract-webview";
 import {
@@ -46,6 +47,40 @@ export class VariantAnalysisView
     manager.registerView(this);
 
     this.dataFlowPathsView = new DataFlowPathsView(app);
+
+    // Set up configuration change listener
+    this.push(
+      workspace.onDidChangeConfiguration(
+        this.onConfigurationChanged.bind(this),
+      ),
+    );
+  }
+
+  /**
+   * Handler for configuration changes
+   */
+  private onConfigurationChanged(e: ConfigurationChangeEvent): void {
+    // Check if the canary setting has changed
+    if (e.affectsConfiguration("codeQL.canary")) {
+      void this.updateCanaryStatus();
+    }
+  }
+
+  /**
+   * Updates the canary status in the webview
+   */
+  private async updateCanaryStatus(): Promise<void> {
+    if (!this.isShowingPanel) {
+      return;
+    }
+
+    // Import isCanary dynamically to ensure we get the latest value
+    const { isCanary } = await import("../config");
+
+    await this.postMessage({
+      t: "setCanaryStatus",
+      isCanary: isCanary(),
+    });
   }
 
   public async openView() {
@@ -110,6 +145,7 @@ export class VariantAnalysisView
   }
 
   protected onPanelDispose(): void {
+    // All listeners registered with this.push will be cleaned up automatically
     this.manager.unregisterView(this);
   }
 
@@ -211,6 +247,10 @@ export class VariantAnalysisView
       isCanary: isCanary(),
     });
 
+    // Send the current canary status immediately so it's handled separately from
+    // variant analysis data
+    await this.updateCanaryStatus();
+
     await this.postMessage({
       t: "setFilterSortState",
       filterSortState,

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

@@ -91,6 +91,9 @@ export function VariantAnalysis({
       vscode.setState({
         variantAnalysisId: msg.variantAnalysis.id,
       });
+    } else if (msg.t === "setCanaryStatus") {
+      // Update the isCanary state when the setting changes
+      setIsCanary(msg.isCanary);
     } else if (msg.t === "setFilterSortState") {
       setFilterSortState(msg.filterSortState);
     } else if (msg.t === "setRepoResults") {