Move legacy-messages.ts to /query-server

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

@@ -26,7 +26,7 @@ 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 "../pure/legacy-messages";
+import { CompilationMessage } from "../query-server/legacy-messages";
 import { sarifParser } from "../common/sarif-parser";
 import { App } from "../common/app";
 import { QueryLanguage } from "../common/query-language";

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

@@ -1,7 +1,7 @@
 import { CancellationTokenSource, env } from "vscode";
 
 import * as messages from "./pure/messages-shared";
-import * as legacyMessages from "./pure/legacy-messages";
+import * as legacyMessages from "./query-server/legacy-messages";
 import * as cli from "./codeql-cli/cli";
 import { pathExists } from "fs-extra";
 import { basename } from "path";

extensions/ql-vscode/src/query-server/legacy-messages.ts

@@ -15,7 +15,7 @@
  */
 
 import { RequestType } from "vscode-jsonrpc";
-import * as shared from "./messages-shared";
+import * as shared from "../pure/messages-shared";
 
 /**
  * A query that should be checked for any errors or warnings

extensions/ql-vscode/src/query-server/legacy/legacy-query-runner.ts

@@ -7,7 +7,7 @@ import {
   Dataset,
   deregisterDatabases,
   registerDatabases,
-} from "../../pure/legacy-messages";
+} from "../legacy-messages";
 import {
   CoreQueryResults,
   CoreQueryTarget,

extensions/ql-vscode/src/query-server/legacy/query-server-client.ts

@@ -13,7 +13,7 @@ import {
   progress,
   ProgressMessage,
   WithProgressId,
-} from "../../pure/legacy-messages";
+} from "../legacy-messages";
 import { ProgressCallback, ProgressTask } from "../../common/vscode/progress";
 import { ServerProcess } from "../server-process";
 import { App } from "../../common/app";

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

@@ -18,7 +18,7 @@ import {
   showAndLogExceptionWithTelemetry,
   showAndLogWarningMessage,
 } from "../../common/logging";
-import * as messages from "../../pure/legacy-messages";
+import * as messages from "../legacy-messages";
 import * as newMessages from "../../pure/new-messages";
 import * as qsClient from "./query-server-client";
 import { asError, getErrorMessage } from "../../common/helpers-pure";

extensions/ql-vscode/src/query-server/legacy/upgrades.ts

@@ -7,7 +7,7 @@ import {
 } from "../../common/vscode/progress";
 import { extLogger } from "../../common/logging/vscode";
 import { showAndLogExceptionWithTelemetry } from "../../common/logging";
-import * as messages from "../../pure/legacy-messages";
+import * as messages from "../legacy-messages";
 import * as qsClient from "./query-server-client";
 import * as tmp from "tmp-promise";
 import { dirname } from "path";

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

@@ -1,5 +1,5 @@
 import * as messages from "./pure/messages-shared";
-import * as legacyMessages from "./pure/legacy-messages";
+import * as legacyMessages from "./query-server/legacy-messages";
 import { DatabaseInfo, QueryMetadata } from "./common/interface-types";
 import { join, parse, dirname, basename } from "path";
 import {

extensions/ql-vscode/test/factories/query-history/local-query-history-item.ts

@@ -5,7 +5,7 @@ import {
   QueryWithResults,
 } from "../../../src/run-queries-shared";
 import { CancellationTokenSource } from "vscode";
-import { QueryResultType } from "../../../src/pure/legacy-messages";
+import { QueryResultType } from "../../../src/query-server/legacy-messages";
 import { QueryMetadata } from "../../../src/common/interface-types";
 
 export function createMockLocalQueryInfo({

extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debug-controller.ts

@@ -9,7 +9,7 @@ import {
 } from "vscode";
 import * as CodeQLProtocol from "../../../../src/debugger/debug-protocol";
 import { DisposableObject } from "../../../../src/common/disposable-object";
-import { QueryResultType } from "../../../../src/pure/legacy-messages";
+import { QueryResultType } from "../../../../src/query-server/legacy-messages";
 import { CoreCompletedQuery } from "../../../../src/query-server/query-runner";
 import { QueryOutputDir } from "../../../../src/run-queries-shared";
 import {

extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts

@@ -3,7 +3,7 @@ import { join, basename } from "path";
 import { dirSync } from "tmp";
 import { pathToFileURL } from "url";
 import { CancellationTokenSource } from "vscode-jsonrpc";
-import * as messages from "../../../src/pure/legacy-messages";
+import * as messages from "../../../src/query-server/legacy-messages";
 import * as qsClient from "../../../src/query-server/legacy/query-server-client";
 import * as cli from "../../../src/codeql-cli/cli";
 import { CellValue } from "../../../src/common/bqrs-cli-types";

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/store/query-history-store.test.ts

@@ -12,7 +12,7 @@ import { QueryWithResults } from "../../../../../src/run-queries-shared";
 import { DatabaseInfo } from "../../../../../src/common/interface-types";
 import { CancellationTokenSource, Uri } from "vscode";
 import { tmpDir } from "../../../../../src/tmp-dir";
-import { QueryResultType } from "../../../../../src/pure/legacy-messages";
+import { QueryResultType } from "../../../../../src/query-server/legacy-messages";
 import { QueryInProgress } from "../../../../../src/query-server/legacy";
 import { VariantAnalysisHistoryItem } from "../../../../../src/query-history/variant-analysis-history-item";
 import { QueryHistoryInfo } from "../../../../../src/query-history/query-history-info";

extensions/ql-vscode/test/vscode-tests/no-workspace/query-results.test.ts

@@ -28,7 +28,7 @@ import {
 import {
   EvaluationResult,
   QueryResultType,
-} from "../../../src/pure/legacy-messages";
+} from "../../../src/query-server/legacy-messages";
 import { sleep } from "../../../src/common/time";
 import { mockedObject } from "../utils/mocking.helpers";
 

extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts

@@ -7,7 +7,7 @@ import {
   compileQuery,
   registerDatabases,
   deregisterDatabases,
-} from "../../../src/pure/legacy-messages";
+} from "../../../src/query-server/legacy-messages";
 import * as config from "../../../src/config";
 import { tmpDir } from "../../../src/tmp-dir";
 import { CodeQLCliServer } from "../../../src/codeql-cli/cli";