diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index 5225e2deb..b6522377f 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 14e5ec8ea..44529bdf1 100644 --- a/extensions/ql-vscode/src/query-history/query-history-manager.ts +++ b/extensions/ql-vscode/src/query-history/query-history-manager.ts @@ -528,8 +528,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 9f17a4bd4..1fa1fe46d 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; + openQueryFile(variantAnalysisId: number): Promise; } 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 6281ce67e..351e5afbf 100644 --- a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts +++ b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts @@ -123,10 +123,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( diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx index cf4a0df25..6c2f27051 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 = () => {