From 2f5f09550d81f38467cc6af8e2c7903c3489dd29 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 15 Nov 2022 16:48:03 +0000 Subject: [PATCH] Remove openVariantAnalysis command --- extensions/ql-vscode/package.json | 8 ---- extensions/ql-vscode/src/extension.ts | 6 --- .../variant-analysis-manager.ts | 40 +------------------ 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index b0515bac76e..8771bbb8d61 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -328,10 +328,6 @@ "command": "codeQL.exportSelectedVariantAnalysisResults", "title": "CodeQL: Export Variant Analysis Results" }, - { - "command": "codeQL.openVariantAnalysis", - "title": "CodeQL: Open Variant Analysis" - }, { "command": "codeQL.runQueries", "title": "CodeQL: Run Queries in Selected Files" @@ -949,10 +945,6 @@ "command": "codeQL.runVariantAnalysis", "when": "config.codeQL.canary && editorLangId == ql && resourceExtname == .ql" }, - { - "command": "codeQL.openVariantAnalysis", - "when": "config.codeQL.canary && config.codeQL.variantAnalysis.liveResults" - }, { "command": "codeQL.exportSelectedVariantAnalysisResults", "when": "config.codeQL.canary" diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index 1c4b78dbad9..90649086d59 100644 --- a/extensions/ql-vscode/src/extension.ts +++ b/extensions/ql-vscode/src/extension.ts @@ -982,12 +982,6 @@ async function activateWithInstalledDistribution( }) ); - ctx.subscriptions.push( - commandRunner('codeQL.openVariantAnalysis', async () => { - await variantAnalysisManager.promptOpenVariantAnalysis(); - }) - ); - ctx.subscriptions.push( commandRunner('codeQL.autoDownloadRemoteQueryResults', async ( queryResult: RemoteQueryResult, diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-manager.ts b/extensions/ql-vscode/src/remote-queries/variant-analysis-manager.ts index 6e1a4811fd2..4742b822071 100644 --- a/extensions/ql-vscode/src/remote-queries/variant-analysis-manager.ts +++ b/extensions/ql-vscode/src/remote-queries/variant-analysis-manager.ts @@ -1,14 +1,13 @@ import * as path from 'path'; import * as ghApiClient from './gh-api/gh-api-client'; -import { CancellationToken, commands, env, EventEmitter, ExtensionContext, Uri, window } from 'vscode'; +import { CancellationToken, commands, env, EventEmitter, ExtensionContext, Uri } from 'vscode'; import { DisposableObject } from '../pure/disposable-object'; import { Credentials } from '../authentication'; import { VariantAnalysisMonitor } from './variant-analysis-monitor'; import { isVariantAnalysisComplete, parseVariantAnalysisQueryLanguage, VariantAnalysis, - VariantAnalysisQueryLanguage, VariantAnalysisRepositoryTask, VariantAnalysisScannedRepository, VariantAnalysisScannedRepositoryDownloadStatus, @@ -19,9 +18,8 @@ import { getErrorMessage } from '../pure/helpers-pure'; import { VariantAnalysisView } from './variant-analysis-view'; import { VariantAnalysisViewManager } from './variant-analysis-view-manager'; import { LoadResultsOptions, VariantAnalysisResultsManager } from './variant-analysis-results-manager'; -import { getControllerRepo, getQueryName, prepareRemoteQueryRun } from './run-remote-query'; +import { getQueryName, prepareRemoteQueryRun } from './run-remote-query'; import { - processUpdatedVariantAnalysis, processVariantAnalysis, processVariantAnalysisRepositoryTask } from './variant-analysis-processor'; @@ -405,38 +403,4 @@ export class VariantAnalysisManager extends DisposableObject implements VariantA private async prepareStorageDirectory(variantAnalysisId: number): Promise { await createTimestampFile(this.getVariantAnalysisStorageLocation(variantAnalysisId)); } - - public async promptOpenVariantAnalysis() { - const credentials = await Credentials.initialize(this.ctx); - if (!credentials) { throw Error('Error authenticating with GitHub'); } - - const controllerRepo = await getControllerRepo(credentials); - - const variantAnalysisIdString = await window.showInputBox({ - title: 'Enter the variant analysis ID', - }); - if (!variantAnalysisIdString) { - return; - } - const variantAnalysisId = parseInt(variantAnalysisIdString, 10); - - const variantAnalysisResponse = await ghApiClient.getVariantAnalysis(credentials, controllerRepo.id, variantAnalysisId); - - const processedVariantAnalysis = processUpdatedVariantAnalysis({ - // We don't really know these values, so just fill in some placeholder values - query: { - name: `Variant analysis ${variantAnalysisId}`, - filePath: `variant_analysis_${variantAnalysisId}.ql`, - language: variantAnalysisResponse.query_language as VariantAnalysisQueryLanguage, - text: '', - }, - databases: {}, - executionStartTime: 0, - }, variantAnalysisResponse); - - void commands.executeCommand('codeQL.openVariantAnalysisView', processedVariantAnalysis.id); - void commands.executeCommand('codeQL.monitorVariantAnalysis', processedVariantAnalysis); - - this._onVariantAnalysisAdded.fire(processedVariantAnalysis); - } }