Pre-cleanup to avoid merge conflicts

Author: Dave Bartolomeo

extensions/ql-vscode/src/cli.ts

@@ -685,23 +685,6 @@ export class CodeQLCliServer implements Disposable {
     return await this.runCodeQlCliCommand(['generate', 'log-summary'], subcommandArgs, 'Generating log summary');
   }
 
-  /**
-  * Generate a JSON summary of an evaluation log.
-  * @param inputPath The path of an evaluation event log.
-  * @param outputPath The path to write a JSON summary of it to.
-  */
-  async generateJsonLogSummary(
-    inputPath: string,
-    outputPath: string
-  ): Promise<string> {
-    const subcommandArgs = [
-      '--minify-output',
-      inputPath,
-      outputPath
-    ];
-    return await this.runCodeQlCliCommand(['generate', 'log-summary'], subcommandArgs, 'Generating log summary');
-  }
-
   /**
   * Gets the results from a bqrs.
   * @param bqrsPath The path to the bqrs.

extensions/ql-vscode/src/log-insights/summary-parser.ts

@@ -41,11 +41,23 @@ const RETURN_REGEXP = /^\s*return /;
  * generates the human-readabe summary to avoid having to rely on regular expression matching of the
  * human-readable text.
  *
+ * @param summaryPath The path to the summary file.
+ * @param symbolsPath The path to the symbols file to generate.
+ */
+export async function generateSummarySymbolsFile(summaryPath: string, symbolsPath: string): Promise<void> {
+  const symbols = await generateSummarySymbols(summaryPath);
+  await fs.writeFile(symbolsPath, JSON.stringify(symbols));
+}
+
+/**
+ * Parse a human-readable evaluation log summary to find the location of the RA for each pipeline
+ * run.
+ *
  * @param fileLocation The path to the summary file.
  * @returns Symbol information for the summary file.
  */
-export async function generateSummarySymbols(fileLocation: string): Promise<SummarySymbols> {
-  const summary = await fs.promises.readFile(fileLocation, { encoding: 'utf-8' });
+async function generateSummarySymbols(summaryPath: string): Promise<SummarySymbols> {
+  const summary = await fs.promises.readFile(summaryPath, { encoding: 'utf-8' });
   const symbols: SummarySymbols = {
     predicates: {}
   };

extensions/ql-vscode/src/run-queries.ts

@@ -37,7 +37,6 @@ import { ensureMetadataIsComplete } from './query-results';
 import { SELECT_QUERY_NAME } from './contextual/locationFinder';
 import { DecodedBqrsChunk } from './pure/bqrs-cli-types';
 import { getErrorMessage } from './pure/helpers-pure';
-import { generateSummarySymbols } from './log-insights/summary-parser';
 
 /**
  * run-queries.ts
@@ -217,16 +216,6 @@ export class QueryEvaluationInfo {
             void qs.logger.log(' --- Evaluator Log Summary --- ');
             void qs.logger.log(buffer.toString());
           });
-
-          // Create the symbol table for the summary file, so we know where each predicate and iteration
-          // is located. We use this info for jumping to the RA for a specific predicate and iteration.
-          // TODO: Move this into the CLI once we're more sure of the format.
-          const symbols = await generateSummarySymbols(this.evalLogSummaryPath);
-          await fs.writeFile(this.evalLogSummarySymbolsPath, JSON.stringify(symbols));
-          queryInfo.evalLogSummarySymbolsLocation = this.evalLogSummarySymbolsPath;
-
-          await qs.cliServer.generateJsonLogSummary(this.evalLogPath, this.evalLogJsonSummaryPath);
-          queryInfo.evalLogJsonSummaryLocation = this.evalLogJsonSummaryPath;
         } else {
           void showAndLogWarningMessage(`Failed to write structured evaluator log to ${this.evalLogPath}.`);
         }