mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Move new-messages.ts to /query-server

Browse Source
This commit is contained in:
Robert
2023-06-21 11:39:21 +01:00
parent f8b0583c5f
commit 1750594d11
15 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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";

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

@@ -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";

2
extensions/ql-vscode/src/debugger/debug-protocol.ts
View File

@@ -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

2
extensions/ql-vscode/src/debugger/debug-session.ts
View File

@@ -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";

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

@@ -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";

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

@@ -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";

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

@@ -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";

2
extensions/ql-vscode/src/pure/new-messages.ts → extensions/ql-vscode/src/query-server/new-messages.ts
View File

@@ -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

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

@@ -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";

2
extensions/ql-vscode/src/query-server/query-runner.ts
View File

@@ -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";

6
extensions/ql-vscode/src/query-server/query-server-client.ts
View File

@@ -7,11 +7,7 @@ import * as cli from "../codeql-cli/cli";
import { QueryServerConfig } from "../config";
import { Logger, showAndLogErrorMessage } from "../common/logging";
import { extLogger, ProgressReporter } from "../common/logging/vscode";
import {
progress,
ProgressMessage,
WithProgressId,
} from "../pure/new-messages";
import { progress, ProgressMessage, WithProgressId } from "./new-messages";
import {
ProgressCallback,
ProgressTask,

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

@@ -1,6 +1,6 @@
import { CancellationToken } from "vscode";
import { ProgressCallback } from "../common/vscode/progress";
import * as messages from "../pure/new-messages";
import * as messages from "./new-messages";
import { QueryOutputDir } from "../run-queries-shared";
import * as qsClient from "./query-server-client";
import { CoreQueryResults, CoreQueryTarget } from "./query-runner";

4
extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts
View File

@@ -1,7 +1,7 @@
import { join, basename } from "path";
import { dirSync } from "tmp";
import { CancellationTokenSource } from "vscode-jsonrpc";
import * as messages from "../../../src/pure/new-messages";
import * as messages from "../../../src/query-server/new-messages";
import * as qsClient from "../../../src/query-server/query-server-client";
import * as cli from "../../../src/codeql-cli/cli";
import { CellValue } from "../../../src/common/bqrs-cli-types";
@@ -11,7 +11,7 @@ import {
extLogger,
ProgressReporter,
} from "../../../src/common/logging/vscode";
import { QueryResultType } from "../../../src/pure/new-messages";
import { QueryResultType } from "../../../src/query-server/new-messages";
import { ensureTestDatabase, getActivatedExtension } from "../global.helper";
import { createMockApp } from "../../__mocks__/appMock";

2
extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
View File

@@ -29,7 +29,7 @@ import {
} from "../../../src/query-server/query-runner";
import { SELECT_QUERY_NAME } from "../../../src/language-support";
import { LocalQueries, QuickEvalType } from "../../../src/local-queries";
import { QueryResultType } from "../../../src/pure/new-messages";
import { QueryResultType } from "../../../src/query-server/new-messages";
import { createVSCodeCommandManager } from "../../../src/common/vscode/commands";
import {
AllCommands,

2
extensions/ql-vscode/test/vscode-tests/no-workspace/data-extensions-editor/external-api-usage-query.test.ts
View File

@@ -6,7 +6,7 @@ import { createMockLogger } from "../../../__mocks__/loggerMock";
import type { Uri } from "vscode";
import { DatabaseKind } from "../../../../src/databases/local-databases";
import { file } from "tmp-promise";
import { QueryResultType } from "../../../../src/pure/new-messages";
import { QueryResultType } from "../../../../src/query-server/new-messages";
import { readdir, readFile } from "fs-extra";
import { load } from "js-yaml";
import { dirname, join } from "path";