Merge pull request #1768 from github/robertbrignull/openVariantAnalysis

Remove the openVariantAnalysis command

Author: robertbrignull

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"

extensions/ql-vscode/src/extension.ts

@@ -995,12 +995,6 @@ async function activateWithInstalledDistribution(
     })
   );
 
-  ctx.subscriptions.push(
-    commandRunner('codeQL.openVariantAnalysis', async () => {
-      await variantAnalysisManager.promptOpenVariantAnalysis();
-    })
-  );
-
   ctx.subscriptions.push(
     commandRunner('codeQL.autoDownloadRemoteQueryResults', async (
       queryResult: RemoteQueryResult,

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';
@@ -412,38 +410,4 @@ export class VariantAnalysisManager extends DisposableObject implements VariantA
   private async prepareStorageDirectory(variantAnalysisId: number): Promise<void> {
     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);
-  }
 }