Move legacy-query-server/ to query-server/legacy/

extensions/ql-vscode/src/extension.ts

@@ -83,7 +83,7 @@ import {
 } from "./common";
 import { QueryHistoryManager } from "./query-history/query-history-manager";
 import { CompletedLocalQueryInfo } from "./query-results";
-import { QueryServerClient as LegacyQueryServerClient } from "./legacy-query-server/queryserver-client";
+import { QueryServerClient as LegacyQueryServerClient } from "./query-server/legacy/queryserver-client";
 import { QueryServerClient } from "./query-server/queryserver-client";
 import { QLTestAdapterFactory } from "./test-adapter";
 import { TestUIService } from "./test-ui";
@@ -97,7 +97,7 @@ import { EvalLogViewer } from "./eval-log-viewer";
 import { SummaryLanguageSupport } from "./log-insights/summary-language-support";
 import { JoinOrderScannerProvider } from "./log-insights/join-order";
 import { LogScannerService } from "./log-insights/log-scanner-service";
-import { LegacyQueryRunner } from "./legacy-query-server/legacyRunner";
+import { LegacyQueryRunner } from "./query-server/legacy/legacyRunner";
 import { NewQueryRunner } from "./query-server/query-runner";
 import { QueryRunner } from "./queryRunner";
 import { VariantAnalysisView } from "./variant-analysis/variant-analysis-view";

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

@@ -21,7 +21,7 @@ import {
   QueryEvaluationInfo,
   QueryWithResults,
 } from "./run-queries-shared";
-import { formatLegacyMessage } from "./legacy-query-server/run-queries";
+import { formatLegacyMessage } from "./query-server/legacy/run-queries";
 import { sarifParser } from "./sarif-parser";
 
 /**

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

@@ -1,15 +1,19 @@
 import { CancellationToken } from "vscode";
-import { CodeQLCliServer } from "../cli";
-import { ProgressCallback } from "../progress";
-import { Logger } from "../common";
-import { DatabaseItem } from "../local-databases";
+import { CodeQLCliServer } from "../../cli";
+import { ProgressCallback } from "../../progress";
+import { Logger } from "../../common";
+import { DatabaseItem } from "../../local-databases";
 import {
   Dataset,
   deregisterDatabases,
   registerDatabases,
-} from "../pure/legacy-messages";
-import { CoreQueryResults, CoreQueryTarget, QueryRunner } from "../queryRunner";
-import { QueryOutputDir } from "../run-queries-shared";
+} from "../../pure/legacy-messages";
+import {
+  CoreQueryResults,
+  CoreQueryTarget,
+  QueryRunner,
+} from "../../queryRunner";
+import { QueryOutputDir } from "../../run-queries-shared";
 import { QueryServerClient } from "./queryserver-client";
 import {
   clearCacheInDatabase,

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

@@ -1,21 +1,21 @@
 import { ensureFile } from "fs-extra";
 
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../../pure/disposable-object";
 import { CancellationToken } from "vscode";
 import { createMessageConnection, RequestType } from "vscode-jsonrpc/node";
-import * as cli from "../cli";
-import { QueryServerConfig } from "../config";
-import { Logger, ProgressReporter } from "../common";
+import * as cli from "../../cli";
+import { QueryServerConfig } from "../../config";
+import { Logger, ProgressReporter } from "../../common";
 import {
   completeQuery,
   EvaluationResult,
   progress,
   ProgressMessage,
   WithProgressId,
-} from "../pure/legacy-messages";
-import { ProgressCallback, ProgressTask } from "../progress";
-import { ServerProcess } from "../json-rpc-server";
-import { App } from "../common/app";
+} from "../../pure/legacy-messages";
+import { ProgressCallback, ProgressTask } from "../../progress";
+import { ServerProcess } from "../../json-rpc-server";
+import { App } from "../../common/app";
 
 type WithProgressReporting = (
   task: (

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

@@ -3,29 +3,29 @@ import { basename } from "path";
 import { CancellationToken, Uri } from "vscode";
 import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
 
-import * as cli from "../cli";
+import * as cli from "../../cli";
 import {
   DatabaseContentsWithDbScheme,
   DatabaseItem,
   DatabaseResolver,
-} from "../local-databases";
+} from "../../local-databases";
 import {
   showAndLogExceptionWithTelemetry,
   showAndLogWarningMessage,
   upgradesTmpDir,
-} from "../helpers";
-import { ProgressCallback } from "../progress";
-import { QueryMetadata } from "../pure/interface-types";
-import { extLogger, Logger } from "../common";
-import * as messages from "../pure/legacy-messages";
-import * as newMessages from "../pure/new-messages";
+} from "../../helpers";
+import { ProgressCallback } from "../../progress";
+import { QueryMetadata } from "../../pure/interface-types";
+import { extLogger, Logger } from "../../common";
+import * as messages from "../../pure/legacy-messages";
+import * as newMessages from "../../pure/new-messages";
 import * as qsClient from "./queryserver-client";
-import { asError, getErrorMessage } from "../pure/helpers-pure";
+import { asError, getErrorMessage } from "../../pure/helpers-pure";
 import { compileDatabaseUpgradeSequence } from "./upgrades";
-import { QueryEvaluationInfo, QueryOutputDir } from "../run-queries-shared";
-import { redactableError } from "../pure/errors";
-import { CoreQueryResults, CoreQueryTarget } from "../queryRunner";
-import { Position } from "../pure/messages-shared";
+import { QueryEvaluationInfo, QueryOutputDir } from "../../run-queries-shared";
+import { redactableError } from "../../pure/errors";
+import { CoreQueryResults, CoreQueryTarget } from "../../queryRunner";
+import { Position } from "../../pure/messages-shared";
 
 export async function compileQuery(
   qs: qsClient.QueryServerClient,

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

@@ -3,16 +3,16 @@ import {
   getOnDiskWorkspaceFolders,
   showAndLogExceptionWithTelemetry,
   tmpDir,
-} from "../helpers";
-import { ProgressCallback, UserCancellationException } from "../progress";
-import { extLogger } from "../common";
-import * as messages from "../pure/legacy-messages";
+} from "../../helpers";
+import { ProgressCallback, UserCancellationException } from "../../progress";
+import { extLogger } from "../../common";
+import * as messages from "../../pure/legacy-messages";
 import * as qsClient from "./queryserver-client";
 import * as tmp from "tmp-promise";
 import { dirname } from "path";
-import { DatabaseItem } from "../local-databases";
-import { asError, getErrorMessage } from "../pure/helpers-pure";
-import { redactableError } from "../pure/errors";
+import { DatabaseItem } from "../../local-databases";
+import { asError, getErrorMessage } from "../../pure/helpers-pure";
+import { redactableError } from "../../pure/errors";
 
 /**
  * Maximum number of lines to include from database upgrade message,

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

@@ -4,11 +4,11 @@ import { dirSync } from "tmp";
 import { pathToFileURL } from "url";
 import { CancellationTokenSource } from "vscode-jsonrpc";
 import * as messages from "../../../src/pure/legacy-messages";
-import * as qsClient from "../../../src/legacy-query-server/queryserver-client";
+import * as qsClient from "../../../src/query-server/legacy/queryserver-client";
 import * as cli from "../../../src/cli";
 import { CellValue } from "../../../src/pure/bqrs-cli-types";
 import { describeWithCodeQL } from "../cli";
-import { QueryServerClient } from "../../../src/legacy-query-server/queryserver-client";
+import { QueryServerClient } from "../../../src/query-server/legacy/queryserver-client";
 import { extLogger, ProgressReporter } from "../../../src/common";
 import { createMockApp } from "../../__mocks__/appMock";
 import { getActivatedExtension } from "../global.helper";

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

@@ -13,7 +13,7 @@ import { DatabaseInfo } from "../../../../../src/pure/interface-types";
 import { CancellationTokenSource, Uri } from "vscode";
 import { tmpDir } from "../../../../../src/helpers";
 import { QueryResultType } from "../../../../../src/pure/legacy-messages";
-import { QueryInProgress } from "../../../../../src/legacy-query-server/run-queries";
+import { QueryInProgress } from "../../../../../src/query-server/legacy/run-queries";
 import { VariantAnalysisHistoryItem } from "../../../../../src/query-history/variant-analysis-history-item";
 import { QueryHistoryInfo } from "../../../../../src/query-history/query-history-info";
 import { createMockVariantAnalysisHistoryItem } from "../../../../factories/query-history/variant-analysis-history-item";

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

@@ -24,7 +24,7 @@ import { tmpDir } from "../../../src/helpers";
 import {
   formatLegacyMessage,
   QueryInProgress,
-} from "../../../src/legacy-query-server/run-queries";
+} from "../../../src/query-server/legacy/run-queries";
 import {
   EvaluationResult,
   QueryResultType,

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

@@ -10,14 +10,14 @@ import {
 } from "../../../src/pure/legacy-messages";
 import * as config from "../../../src/config";
 import { tmpDir } from "../../../src/helpers";
-import { QueryServerClient } from "../../../src/legacy-query-server/queryserver-client";
+import { QueryServerClient } from "../../../src/query-server/legacy/queryserver-client";
 import { CodeQLCliServer } from "../../../src/cli";
 import { SELECT_QUERY_NAME } from "../../../src/contextual/locationFinder";
 import {
   QueryInProgress,
   compileQuery as compileQueryLegacy,
-} from "../../../src/legacy-query-server/run-queries";
-import { LegacyQueryRunner } from "../../../src/legacy-query-server/legacyRunner";
+} from "../../../src/query-server/legacy/run-queries";
+import { LegacyQueryRunner } from "../../../src/query-server/legacy/legacyRunner";
 import { DatabaseItem } from "../../../src/local-databases";
 import { DeepPartial, mockedObject } from "../utils/mocking.helpers";
 import { BqrsKind } from "../../../src/pure/bqrs-cli-types";