Use only legacy results

Author: alexet

extensions/ql-vscode/src/legacy-query-server/run-queries.ts

@@ -497,11 +497,19 @@ function createSyntheticResult(
   return {
     query: query.queryEvalInfo,
     message,
+    result:{
+      evaluationTime:0,
+      queryId: 0,
+      resultType: messages.QueryResultType.OTHER_ERROR,
+      message,
+      runId: 0,
+    },
     sucessful: false,
     dispose: () => { /**/ },
   };
 }
 
+
 function createSimpleTemplates(templates: Record<string, string> | undefined): messages.TemplateDefinitions | undefined {
   if (!templates) {
     return undefined;

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

@@ -51,7 +51,7 @@ export class CompletedQueryInfo implements QueryWithResults {
   /**
    * The legacy result. This is only set when loading from the query history.
    */
-  readonly result?: legacyMessages.EvaluationResult;
+  readonly result: legacyMessages.EvaluationResult;
   readonly logFileLocation?: string;
   resultCount: number;
 
@@ -83,9 +83,8 @@ export class CompletedQueryInfo implements QueryWithResults {
   ) {
     this.query = evaluation.query;
     this.logFileLocation = evaluation.logFileLocation;
-    if (evaluation.result) {
-      this.result = evaluation.result as legacyMessages.EvaluationResult;
-    }
+    this.result = evaluation.result;
+
     this.message = evaluation.message;
     this.sucessful = evaluation.sucessful;
     // Use the dispose method from the evaluation.

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

@@ -13,6 +13,7 @@ import {
 } from '../helpers';
 import { logger } from '../logging';
 import * as messages from '../pure/new-messages';
+import * as legacyMessages from '../pure/legacy-messages';
 import { InitialQueryInfo, LocalQueryInfo } from '../query-results';
 import { QueryEvaluationInfo, QueryWithResults } from '../run-queries-shared';
 import * as qsClient from './queryserver-client';
@@ -123,12 +124,18 @@ export async function compileAndRunQueryAgainstDatabase(
       message = result.message ? `failed: ${result.message}` : 'failed';
       break;
   }
-
+  let  sucessful = result.resultType === messages.QueryResultType.SUCCESS;
   return {
     query,
-    result,
+    result: {
+      evaluationTime: result.evaluationTime,
+      queryId: 0,
+      resultType: sucessful ? legacyMessages.QueryResultType.SUCCESS : legacyMessages.QueryResultType.OTHER_ERROR,
+      runId: 0,
+      message
+    },
     message,
-    sucessful: result.resultType === messages.QueryResultType.SUCCESS,
+    sucessful,
     dispose: () => {
       qs.logger.removeAdditionalLogLocation(undefined);
     }

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

@@ -376,7 +376,7 @@ export interface QueryWithResults {
   readonly dispose: () => void;
   readonly sucessful?: boolean;
   readonly message?: string;
-  readonly result?: legacyMessages.EvaluationResult | newMessages.RunQueryResult
+  readonly result: legacyMessages.EvaluationResult;
 }