Merge pull request #3172 from github/koesie10/remove-legacy-messages

Remove legacy messages

Author: koesie10

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

@@ -30,11 +30,11 @@ import { walkDirectory } from "../common/files";
 import { QueryMetadata, SortDirection } from "../common/interface-types";
 import { BaseLogger, Logger } from "../common/logging";
 import { ProgressReporter } from "../common/logging/vscode";
-import { CompilationMessage } from "../query-server/legacy-messages";
 import { sarifParser } from "../common/sarif-parser";
 import { App } from "../common/app";
 import { QueryLanguage } from "../common/query-language";
 import { LINE_ENDINGS, splitStreamAtSeparators } from "../common/split-stream";
+import { Position } from "../query-server/new-messages";
 
 /**
  * The version of the SARIF format that we are using.
@@ -159,6 +159,24 @@ export type ResolvedQueries = string[];
  */
 export type ResolvedTests = string[];
 
+/**
+ * A compilation message for a test message (either an error or a warning)
+ */
+export interface CompilationMessage {
+  /**
+   * The text of the message
+   */
+  message: string;
+  /**
+   * The source position associated with the message
+   */
+  position: Position;
+  /**
+   * The severity of the message
+   */
+  severity: number;
+}
+
 /**
  * Event fired by `codeql test run`.
  */

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

@@ -125,12 +125,12 @@ export class CompareView extends AbstractWebview<
           // only run interpolation if the label is user-defined
           // otherwise we will wind up with duplicated rows
           name: this.labelProvider.getShortLabel(from),
-          status: from.completedQuery.statusString,
+          status: from.completedQuery.message,
           time: from.startTime,
         },
         toQuery: {
           name: this.labelProvider.getShortLabel(to),
-          status: to.completedQuery.statusString,
+          status: to.completedQuery.message,
           time: to.startTime,
         },
       },

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

@@ -178,15 +178,6 @@ export class LocalQueryRun {
     const successful = results.resultType === QueryResultType.SUCCESS;
     return {
       query,
-      result: {
-        evaluationTime: results.evaluationTime,
-        queryId: 0,
-        resultType: successful
-          ? QueryResultType.SUCCESS
-          : QueryResultType.OTHER_ERROR,
-        runId: 0,
-        message,
-      },
       message,
       successful,
     };

extensions/ql-vscode/src/query-history/history-item-label-provider.ts

@@ -77,14 +77,14 @@ export class HistoryItemLabelProvider {
   private getLocalInterpolateReplacements(
     item: LocalQueryInfo,
   ): InterpolateReplacements {
-    const { resultCount = 0, statusString = "in progress" } =
+    const { resultCount = 0, message = "in progress" } =
       item.completedQuery || {};
     return {
       t: item.startTime,
       q: item.getQueryName(),
       d: item.databaseName,
       r: `(${resultCount} results)`,
-      s: statusString,
+      s: message,
       f: item.getQueryFileName(),
       l: this.getLanguageLabel(item),
       "%": "%",

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -1058,7 +1058,7 @@ export class QueryHistoryManager extends DisposableObject {
       .map((item) => ({
         label: this.labelProvider.getLabel(item),
         description: item.databaseName,
-        detail: item.completedQuery.statusString,
+        detail: item.completedQuery.message,
         query: item,
       }));
     if (comparableQueryLabels.length < 1) {

extensions/ql-vscode/src/query-history/store/query-history-local-query-domain-mapper.ts

@@ -46,14 +46,6 @@ function mapCompletedQueryToDto(
 
   return {
     query: mapQueryEvaluationInfoToDto(query.query),
-    result: {
-      runId: query.result.runId,
-      queryId: query.result.queryId,
-      resultType: query.result.resultType,
-      evaluationTime: query.result.evaluationTime,
-      message: query.result.message,
-      logFileLocation: query.result.logFileLocation,
-    },
     logFileLocation: query.logFileLocation,
     successful: query.successful,
     message: query.message,

extensions/ql-vscode/src/query-history/store/query-history-local-query-dto-mapper.ts

@@ -56,17 +56,9 @@ function mapCompletedQueryInfoToDomainModel(
 
   return new CompletedQueryInfo(
     mapQueryEvaluationInfoToDomainModel(completedQuery.query),
-    {
-      runId: completedQuery.result.runId,
-      queryId: completedQuery.result.queryId,
-      resultType: completedQuery.result.resultType,
-      evaluationTime: completedQuery.result.evaluationTime,
-      message: completedQuery.result.message,
-      logFileLocation: completedQuery.result.logFileLocation,
-    },
     completedQuery.logFileLocation,
-    completedQuery.successful ?? completedQuery.sucessful,
-    completedQuery.message,
+    completedQuery.successful ?? false,
+    completedQuery.message ?? "",
     sortState,
     completedQuery.resultCount,
     sortedResults,

extensions/ql-vscode/src/query-history/store/query-history-local-query-dto.ts

@@ -52,7 +52,6 @@ export interface CompletedQueryInfoDto {
 
   // There once was a typo in the data model, which is why we need to support both
   sucessful?: boolean;
-  result: EvaluationResultDto;
   logFileLocation?: string;
   resultCount: number;
   sortedResultsInfo: Record<string, SortedResultSetInfoDto>;
@@ -81,15 +80,6 @@ export enum SortDirectionDto {
   desc,
 }
 
-interface EvaluationResultDto {
-  runId: number;
-  queryId: number;
-  resultType: number;
-  evaluationTime: number;
-  message?: string;
-  logFileLocation?: string;
-}
-
 export interface QueryEvaluationInfoDto {
   querySaveDir: string;
   dbItemPath: string;

extensions/ql-vscode/src/query-results.ts

@@ -1,7 +1,6 @@
 import { CancellationTokenSource, env } from "vscode";
 
 import * as messages from "./query-server/messages-shared";
-import * as legacyMessages from "./query-server/legacy-messages";
 import * as cli from "./codeql-cli/cli";
 import { pathExists } from "fs-extra";
 import { basename } from "path";
@@ -23,7 +22,6 @@ import {
   QueryWithResults,
 } from "./run-queries-shared";
 import { sarifParser } from "./common/sarif-parser";
-import { formatLegacyMessage } from "./query-server/format-legacy-message";
 
 /**
  * query-results.ts
@@ -54,14 +52,9 @@ export interface InitialQueryInfo {
 export class CompletedQueryInfo implements QueryWithResults {
   constructor(
     public readonly query: QueryEvaluationInfo,
-
-    /**
-     * The legacy result. This is only set when loading from the query history.
-     */
-    public readonly result: legacyMessages.EvaluationResult,
     public readonly logFileLocation: string | undefined,
-    public readonly successful: boolean | undefined,
-    public readonly message: string | undefined,
+    public readonly successful: boolean,
+    public readonly message: string,
     /**
      * How we're currently sorting alerts. This is not mere interface
      * state due to truncation; on re-sort, we want to read in the file
@@ -82,16 +75,6 @@ export class CompletedQueryInfo implements QueryWithResults {
     this.resultCount = value;
   }
 
-  get statusString(): string {
-    if (this.message) {
-      return this.message;
-    } else if (this.result) {
-      return formatLegacyMessage(this.result);
-    } else {
-      throw new Error("No status available");
-    }
-  }
-
   getResultsPath(selectedTable: string, useSorted = true): string {
     if (!useSorted) {
       return this.query.resultsPaths.resultsPath;
@@ -291,7 +274,6 @@ export class LocalQueryInfo {
   completeThisQuery(info: QueryWithResults): void {
     this.completedQuery = new CompletedQueryInfo(
       info.query,
-      info.result,
       info.query.logPath,
       info.successful,
       info.message,