Move new-messages.ts to /query-server

Author: robertbrignull

extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts

@@ -11,7 +11,7 @@ import { CodeQLCliServer } from "../codeql-cli/cli";
 import { DatabaseItem } from "../databases/local-databases";
 import { ProgressCallback } from "../common/vscode/progress";
 import { fetchExternalApiQueries } from "./queries";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { join } from "path";
 import { redactableError } from "../common/errors";
 import { telemetryListener } from "../common/vscode/telemetry";

extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts

@@ -13,7 +13,7 @@ import {
   ModeledMethodWithSignature,
 } from "./modeled-method";
 import { redactableError } from "../common/errors";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { file } from "tmp-promise";
 import { writeFile } from "fs-extra";
 import { dump } from "js-yaml";

extensions/ql-vscode/src/debugger/debug-protocol.ts

@@ -1,5 +1,5 @@
 import { DebugProtocol } from "@vscode/debugprotocol";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { QuickEvalContext } from "../run-queries-shared";
 
 // Events

extensions/ql-vscode/src/debugger/debug-session.ts

@@ -14,7 +14,7 @@ import { Disposable } from "vscode";
 import { CancellationTokenSource } from "vscode-jsonrpc";
 import { BaseLogger, LogOptions } from "../common/logging";
 import { queryServerLogger } from "../common/logging/vscode";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { CoreQueryResults, CoreQueryRun, QueryRunner } from "../query-server";
 import * as CodeQLProtocol from "./debug-protocol";
 import { QuickEvalContext } from "../run-queries-shared";

extensions/ql-vscode/src/language-support/contextual/location-finder.ts

@@ -20,7 +20,7 @@ import {
 import { CancellationToken, LocationLink, Uri } from "vscode";
 import { QueryOutputDir } from "../../run-queries-shared";
 import { QueryRunner } from "../../query-server";
-import { QueryResultType } from "../../pure/new-messages";
+import { QueryResultType } from "../../query-server/new-messages";
 import { fileRangeFromURI } from "./file-range-from-uri";
 
 export const SELECT_QUERY_NAME = "#select";

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

@@ -19,7 +19,7 @@ import {
 import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
 import { WebviewReveal } from "./webview";
 import { CodeQLCliServer } from "../codeql-cli/cli";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { redactableError } from "../common/errors";
 import { LocalQueries } from "./local-queries";
 import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";

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

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

…sions/ql-vscode/src/pure/new-messages.ts …-vscode/src/query-server/new-messages.tsextensions/ql-vscode/src/pure/new-messages.ts renamed to extensions/ql-vscode/src/query-server/new-messages.ts extensions/ql-vscode/src/pure/new-messages.ts renamed to extensions/ql-vscode/src/query-server/new-messages.ts

@@ -15,7 +15,7 @@
  */
 
 import { RequestType } from "vscode-jsonrpc";
-import * as shared from "../query-server/messages-shared";
+import * as shared from "./messages-shared";
 
 /**
  * Parameters to clear the cache

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

@@ -11,7 +11,7 @@ import {
   deregisterDatabases,
   registerDatabases,
   upgradeDatabase,
-} from "../pure/new-messages";
+} from "./new-messages";
 import { CoreQueryResults, CoreQueryTarget, QueryRunner } from "./query-runner";
 import { QueryServerClient } from "./query-server-client";
 import { compileAndRunQueryAgainstDatabaseCore } from "./run-queries";

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

@@ -3,7 +3,7 @@ import { CodeQLCliServer } from "../codeql-cli/cli";
 import { ProgressCallback } from "../common/vscode/progress";
 import { DatabaseItem } from "../databases/local-databases";
 import { QueryOutputDir } from "../run-queries-shared";
-import { Position, QueryResultType } from "../pure/new-messages";
+import { Position, QueryResultType } from "./new-messages";
 import { BaseLogger, Logger } from "../common/logging";
 import { basename, join } from "path";
 import { nanoid } from "nanoid";