Add evaluation results to query object

Ensures better backwards compatibility with legacy query objects.

Author: aeisenberg

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

@@ -84,7 +84,7 @@ export class CompletedQueryInfo implements QueryWithResults {
     this.query = evaluation.query;
     this.logFileLocation = evaluation.logFileLocation;
     if (evaluation.result) {
-      this.result = evaluation.result;
+      this.result = evaluation.result as legacyMessages.EvaluationResult;
     }
     this.message = evaluation.message;
     this.sucessful = evaluation.sucessful;

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

@@ -81,7 +81,7 @@ export async function compileAndRunQueryAgainstDatabase(
     target,
   };
   await query.createTimestampFile();
-  let result;
+  let result: messages.RunQueryResult | undefined;
   try {
     result = await qs.sendRequest(messages.runQuery, queryToRun, token, progress);
     if (qs.config.customLogDirectory) {
@@ -126,6 +126,7 @@ export async function compileAndRunQueryAgainstDatabase(
 
   return {
     query,
+    result,
     message,
     sucessful: result.resultType === messages.QueryResultType.SUCCESS,
     dispose: () => {

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

@@ -1,5 +1,6 @@
 import * as messages from './pure/messages-shared';
 import * as legacyMessages from './pure/legacy-messages';
+import * as newMessages from './pure/new-messages';
 import { DatabaseInfo, QueryMetadata } from './pure/interface-types';
 import * as path from 'path';
 import { createTimestampFile, showAndLogWarningMessage } from './helpers';
@@ -375,7 +376,7 @@ export interface QueryWithResults {
   readonly dispose: () => void;
   readonly sucessful?: boolean;
   readonly message?: string;
-  readonly result?: legacyMessages.EvaluationResult
+  readonly result?: legacyMessages.EvaluationResult | newMessages.RunQueryResult
 }