Refactor

Author: paldepind

extensions/ql-vscode/src/codeql-cli/cli.ts

@@ -1279,7 +1279,7 @@ export class CodeQLCliServer implements Disposable {
     return { uniquePath1, uniquePath2, cleanup };
   }
 
-  async runInterpretCommand(
+  private async runInterpretCommand(
     format: string,
     additonalArgs: string[],
     metadata: QueryMetadata,
@@ -1294,21 +1294,22 @@ export class CodeQLCliServer implements Disposable {
       format,
       // Forward all of the query metadata.
       ...Object.entries(metadata).map(([key, value]) => `-t=${key}=${value}`),
-    ].concat(additonalArgs);
-    if (sourceInfo !== undefined) {
-      args.push(
-        "--source-archive",
-        sourceInfo.sourceArchive,
-        "--source-location-prefix",
-        sourceInfo.sourceLocationPrefix,
-      );
-    }
-
-    args.push("--threads", this.cliConfig.numberThreads.toString());
-
-    args.push("--max-paths", this.cliConfig.maxPaths.toString());
+      ...additonalArgs,
+      ...(sourceInfo !== undefined
+        ? [
+            "--source-archive",
+            sourceInfo.sourceArchive,
+            "--source-location-prefix",
+            sourceInfo.sourceLocationPrefix,
+          ]
+        : []),
+      "--threads",
+      this.cliConfig.numberThreads.toString(),
+      "--max-paths",
+      this.cliConfig.maxPaths.toString(),
+      resultsPath,
+    ];
 
-    args.push(resultsPath);
     await this.runCodeQlCliCommand(
       ["bqrs", "interpret"],
       args,

extensions/ql-vscode/src/compare/compare-view.ts

@@ -168,16 +168,23 @@ export class CompareView extends AbstractWebview<
       currentResultSetDisplayName,
       fromResultSetName,
       toResultSetName,
-    } = await this.findResultSetsToCompare(
-      this.comparePair,
+    } = await findResultSetNames(
+      this.comparePair.fromInfo,
+      this.comparePair.toInfo,
+      this.comparePair.commonResultSetNames,
       selectedResultSetName,
     );
     if (currentResultSetDisplayName) {
       let result: QueryCompareResult | undefined;
       let message: string | undefined;
       try {
         if (currentResultSetName === ALERTS_TABLE_NAME) {
-          result = await this.compareInterpretedResults(this.comparePair);
+          result = await compareInterpretedResults(
+            this.databaseManager,
+            this.cliServer,
+            this.comparePair.from,
+            this.comparePair.to,
+          );
         } else {
           result = await this.compareResults(
             this.comparePair,
@@ -344,31 +351,6 @@ export class CompareView extends AbstractWebview<
     }
   }
 
-  private async findResultSetsToCompare(
-    { fromInfo, toInfo, commonResultSetNames }: ComparePair,
-    selectedResultSetName: string | undefined,
-  ) {
-    const {
-      currentResultSetName,
-      currentResultSetDisplayName,
-      fromResultSetName,
-      toResultSetName,
-    } = await findResultSetNames(
-      fromInfo,
-      toInfo,
-      commonResultSetNames,
-      selectedResultSetName,
-    );
-
-    return {
-      commonResultSetNames,
-      currentResultSetName,
-      currentResultSetDisplayName,
-      fromResultSetName,
-      toResultSetName,
-    };
-  }
-
   private async changeTable(newResultSetName: string) {
     await this.showResultsInternal(newResultSetName);
   }
@@ -450,18 +432,6 @@ export class CompareView extends AbstractWebview<
     }
   }
 
-  private async compareInterpretedResults({
-    from,
-    to,
-  }: ComparePair): Promise<InterpretedQueryCompareResult> {
-    return compareInterpretedResults(
-      this.databaseManager,
-      this.cliServer,
-      from,
-      to,
-    );
-  }
-
   private async openQuery(kind: "from" | "to") {
     const toOpen =
       kind === "from" ? this.comparePair?.from : this.comparePair?.to;