From 34ab4090500a1c603518e6de8f07986c8937bb16 Mon Sep 17 00:00:00 2001
From: Robert <robertbrignull@github.com>
Date: Wed, 15 Mar 2023 17:06:17 +0000
Subject: [PATCH 1/2] Remove codeQL.openVariantAnalysisQueryFile command

---
 extensions/ql-vscode/src/extension.ts                    | 9 ---------
 .../ql-vscode/src/query-history/query-history-manager.ts | 3 +--
 .../variant-analysis/variant-analysis-view-manager.ts    | 1 +
 .../src/variant-analysis/variant-analysis-view.ts        | 5 +----
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
index 5225e2deb4a..b6522377f2a 100644
--- a/extensions/ql-vscode/src/extension.ts
+++ b/extensions/ql-vscode/src/extension.ts
@@ -1216,15 +1216,6 @@ async function activateWithInstalledDistribution(
     ),
   );
 
-  ctx.subscriptions.push(
-    commandRunner(
-      "codeQL.openVariantAnalysisQueryFile",
-      async (variantAnalysisId: number) => {
-        await variantAnalysisManager.openQueryFile(variantAnalysisId);
-      },
-    ),
-  );
-
   ctx.subscriptions.push(
     commandRunner("codeQL.openReferencedFile", async (selectedQuery: Uri) => {
       await openReferencedFile(qs, cliServer, selectedQuery);
diff --git a/extensions/ql-vscode/src/query-history/query-history-manager.ts b/extensions/ql-vscode/src/query-history/query-history-manager.ts
index 279792ee559..f5dd7cf9af1 100644
--- a/extensions/ql-vscode/src/query-history/query-history-manager.ts
+++ b/extensions/ql-vscode/src/query-history/query-history-manager.ts
@@ -522,8 +522,7 @@ export class QueryHistoryManager extends DisposableObject {
     }
 
     if (finalSingleItem.t === "variant-analysis") {
-      await commands.executeCommand(
-        "codeQL.openVariantAnalysisQueryFile",
+      await this.variantAnalysisManager.openQueryFile(
         finalSingleItem.variantAnalysis.id,
       );
       return;
diff --git a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts
index 9f17a4bd43d..1fa1fe46d8f 100644
--- a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts
+++ b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts
@@ -24,4 +24,5 @@ export interface VariantAnalysisViewManager<
   getRepoStates(
     variantAnalysisId: number,
   ): Promise<VariantAnalysisScannedRepositoryState[]>;
+  openQueryFile(variantAnalysisId: number): Promise<void>;
 }
diff --git a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts
index ef9a47bc545..77bd7b0e292 100644
--- a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts
+++ b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts
@@ -119,10 +119,7 @@ export class VariantAnalysisView
         );
         break;
       case "openQueryFile":
-        void commands.executeCommand(
-          "codeQL.openVariantAnalysisQueryFile",
-          this.variantAnalysisId,
-        );
+        await this.manager.openQueryFile(this.variantAnalysisId);
         break;
       case "openQueryText":
         void commands.executeCommand(

From 29bb7ce01ee03cb326a0def1d6526fe8c073a560 Mon Sep 17 00:00:00 2001
From: Robert <robertbrignull@github.com>
Date: Thu, 16 Mar 2023 10:39:02 +0000
Subject: [PATCH 2/2] Emit telemetry when opening variant analysis query file

---
 .../ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx
index cf4a0df2506..6c2f27051c6 100644
--- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx
+++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx
@@ -13,7 +13,7 @@ import { VariantAnalysisLoading } from "./VariantAnalysisLoading";
 import { ToVariantAnalysisMessage } from "../../pure/interface-types";
 import { vscode } from "../vscode-api";
 import { defaultFilterSortState } from "../../pure/variant-analysis-filter-sort";
-import { useTelemetryOnChange } from "../common/telemetry";
+import { sendTelemetry, useTelemetryOnChange } from "../common/telemetry";
 
 export type VariantAnalysisProps = {
   variantAnalysis?: VariantAnalysisDomainModel;
@@ -25,6 +25,7 @@ const openQueryFile = () => {
   vscode.postMessage({
     t: "openQueryFile",
   });
+  sendTelemetry("variant-analysis-open-query-file");
 };
 
 const openQueryText = () => {