Move runVariantAnalysis to top level

Author: robertbrignull

extensions/ql-vscode/src/extension.ts

@@ -1080,32 +1080,15 @@ async function activateWithInstalledDistribution(
     ),
   );
 
-  async function runVariantAnalysis(
-    progress: ProgressCallback,
-    token: CancellationToken,
-    uri: Uri | undefined,
-  ): Promise<void> {
-    progress({
-      maxStep: 5,
-      step: 0,
-      message: "Getting credentials",
-    });
-
-    await variantAnalysisManager.runVariantAnalysis(
-      uri || window.activeTextEditor?.document.uri,
-      progress,
-      token,
-    );
-  }
-
   ctx.subscriptions.push(
     commandRunnerWithProgress(
       "codeQL.runVariantAnalysis",
       async (
         progress: ProgressCallback,
         token: CancellationToken,
         uri: Uri | undefined,
-      ) => await runVariantAnalysis(progress, token, uri),
+      ) =>
+        await runVariantAnalysis(variantAnalysisManager, progress, token, uri),
       {
         title: "Run Variant Analysis",
         cancellable: true,
@@ -1121,7 +1104,8 @@ async function activateWithInstalledDistribution(
         progress: ProgressCallback,
         token: CancellationToken,
         uri: Uri | undefined,
-      ) => await runVariantAnalysis(progress, token, uri),
+      ) =>
+        await runVariantAnalysis(variantAnalysisManager, progress, token, uri),
       {
         title: "Run Variant Analysis",
         cancellable: true,
@@ -1895,6 +1879,25 @@ async function openReferencedFile(
   }
 }
 
+async function runVariantAnalysis(
+  variantAnalysisManager: VariantAnalysisManager,
+  progress: ProgressCallback,
+  token: CancellationToken,
+  uri: Uri | undefined,
+): Promise<void> {
+  progress({
+    maxStep: 5,
+    step: 0,
+    message: "Getting credentials",
+  });
+
+  await variantAnalysisManager.runVariantAnalysis(
+    uri || window.activeTextEditor?.document.uri,
+    progress,
+    token,
+  );
+}
+
 function addUnhandledRejectionListener() {
   const handler = (error: unknown) => {
     // This listener will be triggered for errors from other extensions as