Skip to content

Commit 2f5f095

Browse files
Remove openVariantAnalysis command
1 parent 846eda5 commit 2f5f095

File tree

3 files changed

+2
-52
lines changed

3 files changed

+2
-52
lines changed

extensions/ql-vscode/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,6 @@
328328
"command": "codeQL.exportSelectedVariantAnalysisResults",
329329
"title": "CodeQL: Export Variant Analysis Results"
330330
},
331-
{
332-
"command": "codeQL.openVariantAnalysis",
333-
"title": "CodeQL: Open Variant Analysis"
334-
},
335331
{
336332
"command": "codeQL.runQueries",
337333
"title": "CodeQL: Run Queries in Selected Files"
@@ -949,10 +945,6 @@
949945
"command": "codeQL.runVariantAnalysis",
950946
"when": "config.codeQL.canary && editorLangId == ql && resourceExtname == .ql"
951947
},
952-
{
953-
"command": "codeQL.openVariantAnalysis",
954-
"when": "config.codeQL.canary && config.codeQL.variantAnalysis.liveResults"
955-
},
956948
{
957949
"command": "codeQL.exportSelectedVariantAnalysisResults",
958950
"when": "config.codeQL.canary"

extensions/ql-vscode/src/extension.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -982,12 +982,6 @@ async function activateWithInstalledDistribution(
982982
})
983983
);
984984

985-
ctx.subscriptions.push(
986-
commandRunner('codeQL.openVariantAnalysis', async () => {
987-
await variantAnalysisManager.promptOpenVariantAnalysis();
988-
})
989-
);
990-
991985
ctx.subscriptions.push(
992986
commandRunner('codeQL.autoDownloadRemoteQueryResults', async (
993987
queryResult: RemoteQueryResult,

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

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import * as path from 'path';
22

33
import * as ghApiClient from './gh-api/gh-api-client';
4-
import { CancellationToken, commands, env, EventEmitter, ExtensionContext, Uri, window } from 'vscode';
4+
import { CancellationToken, commands, env, EventEmitter, ExtensionContext, Uri } from 'vscode';
55
import { DisposableObject } from '../pure/disposable-object';
66
import { Credentials } from '../authentication';
77
import { VariantAnalysisMonitor } from './variant-analysis-monitor';
88
import {
99
isVariantAnalysisComplete, parseVariantAnalysisQueryLanguage,
1010
VariantAnalysis,
11-
VariantAnalysisQueryLanguage,
1211
VariantAnalysisRepositoryTask,
1312
VariantAnalysisScannedRepository,
1413
VariantAnalysisScannedRepositoryDownloadStatus,
@@ -19,9 +18,8 @@ import { getErrorMessage } from '../pure/helpers-pure';
1918
import { VariantAnalysisView } from './variant-analysis-view';
2019
import { VariantAnalysisViewManager } from './variant-analysis-view-manager';
2120
import { LoadResultsOptions, VariantAnalysisResultsManager } from './variant-analysis-results-manager';
22-
import { getControllerRepo, getQueryName, prepareRemoteQueryRun } from './run-remote-query';
21+
import { getQueryName, prepareRemoteQueryRun } from './run-remote-query';
2322
import {
24-
processUpdatedVariantAnalysis,
2523
processVariantAnalysis,
2624
processVariantAnalysisRepositoryTask
2725
} from './variant-analysis-processor';
@@ -405,38 +403,4 @@ export class VariantAnalysisManager extends DisposableObject implements VariantA
405403
private async prepareStorageDirectory(variantAnalysisId: number): Promise<void> {
406404
await createTimestampFile(this.getVariantAnalysisStorageLocation(variantAnalysisId));
407405
}
408-
409-
public async promptOpenVariantAnalysis() {
410-
const credentials = await Credentials.initialize(this.ctx);
411-
if (!credentials) { throw Error('Error authenticating with GitHub'); }
412-
413-
const controllerRepo = await getControllerRepo(credentials);
414-
415-
const variantAnalysisIdString = await window.showInputBox({
416-
title: 'Enter the variant analysis ID',
417-
});
418-
if (!variantAnalysisIdString) {
419-
return;
420-
}
421-
const variantAnalysisId = parseInt(variantAnalysisIdString, 10);
422-
423-
const variantAnalysisResponse = await ghApiClient.getVariantAnalysis(credentials, controllerRepo.id, variantAnalysisId);
424-
425-
const processedVariantAnalysis = processUpdatedVariantAnalysis({
426-
// We don't really know these values, so just fill in some placeholder values
427-
query: {
428-
name: `Variant analysis ${variantAnalysisId}`,
429-
filePath: `variant_analysis_${variantAnalysisId}.ql`,
430-
language: variantAnalysisResponse.query_language as VariantAnalysisQueryLanguage,
431-
text: '',
432-
},
433-
databases: {},
434-
executionStartTime: 0,
435-
}, variantAnalysisResponse);
436-
437-
void commands.executeCommand('codeQL.openVariantAnalysisView', processedVariantAnalysis.id);
438-
void commands.executeCommand('codeQL.monitorVariantAnalysis', processedVariantAnalysis);
439-
440-
this._onVariantAnalysisAdded.fire(processedVariantAnalysis);
441-
}
442406
}

0 commit comments

Comments
 (0)