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

Merge pull request #3175 from github/koesie10/rename-new-messages

Browse Source 
Remove remaining references to new messages/new query server
This commit is contained in:
Koen Vlaswinkel
2024-01-02 13:44:00 +01:00
committed by GitHub
parent f5dbcc8cc1 767c3cc35c
commit fa7ecb782e
18 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/codeql-cli/cli.ts
View File

@@ -34,7 +34,7 @@ import { sarifParser } from "../common/sarif-parser";
import { App } from "../common/app";
import { QueryLanguage } from "../common/query-language";
import { LINE_ENDINGS, splitStreamAtSeparators } from "../common/split-stream";
import { Position } from "../query-server/new-messages";
import { Position } from "../query-server/messages";
/**
* The version of the SARIF format that we are using.

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

@@ -1,5 +1,5 @@
import { DebugProtocol } from "@vscode/debugprotocol";
import { QueryResultType } from "../query-server/new-messages";
import { QueryResultType } from "../query-server/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 "../query-server/new-messages";
import { QueryResultType } from "../query-server/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

@@ -19,7 +19,7 @@ import {
import { CancellationToken, LocationLink, Uri } from "vscode";
import { QueryOutputDir } from "../../run-queries-shared";
import { QueryRunner } from "../../query-server";
import { QueryResultType } from "../../query-server/new-messages";
import { QueryResultType } from "../../query-server/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 "../query-server/new-messages";
import { QueryResultType } from "../query-server/messages";
import { redactableError } from "../common/errors";
import { LocalQueries } from "./local-queries";
import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";

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

@@ -3,7 +3,7 @@ import { ProgressCallback } from "../common/vscode/progress";
import { DatabaseItem } from "../databases/local-databases";
import { CoreCompletedQuery, QueryRunner } from "../query-server";
import { TeeLogger, showAndLogExceptionWithTelemetry } from "../common/logging";
import { QueryResultType } from "../query-server/new-messages";
import { QueryResultType } from "../query-server/messages";
import { extLogger } from "../common/logging/vscode";
import { telemetryListener } from "../common/vscode/telemetry";
import { redactableError } from "../common/errors";

4
extensions/ql-vscode/src/query-server/messages-shared.ts
View File

@@ -70,10 +70,6 @@ export interface QuickEvalOptions {
quickEvalPos?: Position;
/**
* Whether to only count the number of results.
*
* This is only supported by the new query server
* but it isn't worth having a separate type and
* it is fine to have an ignored optional field.
*/
countOnly?: boolean;
}

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

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

@@ -17,7 +17,7 @@ import {
trimCache,
TrimCacheParams,
upgradeDatabase,
} from "./new-messages";
} from "./messages";
import { BaseLogger, Logger } from "../common/logging";
import { basename, join } from "path";
import { nanoid } from "nanoid";

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

@@ -7,7 +7,7 @@ import * as cli from "../codeql-cli/cli";
import { QueryServerConfig } from "../config";
import { BaseLogger, Logger, showAndLogErrorMessage } from "../common/logging";
import { extLogger, ProgressReporter } from "../common/logging/vscode";
import { progress, ProgressMessage, WithProgressId } from "./new-messages";
import { progress, ProgressMessage, WithProgressId } from "./messages";
import {
ProgressCallback,
ProgressTask,
@@ -169,7 +169,7 @@ export class QueryServerClient extends DisposableObject {
private async startQueryServerImpl(
progressReporter: ProgressReporter,
): Promise<void> {
void this.logger.log("Starting NEW query server.");
void this.logger.log("Starting query server.");
const ramArgs = await this.cliServer.resolveRam(
this.config.queryMemoryMb,

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 "./new-messages";
import * as messages from "./messages";
import { QueryOutputDir } from "../run-queries-shared";
import * as qsClient from "./query-server-client";
import { CoreQueryResults, CoreQueryTarget } from "./query-runner";

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

@@ -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/query-server/new-messages";
import { QueryResultType } from "../../../../src/query-server/messages";
import { CoreCompletedQuery } from "../../../../src/query-server/query-runner";
import { QueryOutputDir } from "../../../../src/run-queries-shared";
import {

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/query-server/new-messages";
import { QueryResultType } from "../../../src/query-server/messages";
import { createVSCodeCommandManager } from "../../../src/common/vscode/commands";
import {
AllCommands,

24
extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts → extensions/ql-vscode/test/vscode-tests/cli-integration/query-server/query-server-client.test.ts
View File

@@ -1,21 +1,21 @@
import { join, basename } from "path";
import { dirSync } from "tmp";
import { CancellationTokenSource } from "vscode-jsonrpc";
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 { BqrsCellValue } from "../../../src/common/bqrs-cli-types";
import { describeWithCodeQL } from "../cli";
import { QueryServerClient } from "../../../src/query-server/query-server-client";
import * as messages from "../../../../src/query-server/messages";
import * as qsClient from "../../../../src/query-server/query-server-client";
import * as cli from "../../../../src/codeql-cli/cli";
import { BqrsCellValue } from "../../../../src/common/bqrs-cli-types";
import { describeWithCodeQL } from "../../cli";
import { QueryServerClient } from "../../../../src/query-server/query-server-client";
import {
extLogger,
ProgressReporter,
} from "../../../src/common/logging/vscode";
import { QueryResultType } from "../../../src/query-server/new-messages";
import { ensureTestDatabase, getActivatedExtension } from "../global.helper";
import { createMockApp } from "../../__mocks__/appMock";
} from "../../../../src/common/logging/vscode";
import { QueryResultType } from "../../../../src/query-server/messages";
import { ensureTestDatabase, getActivatedExtension } from "../../global.helper";
import { createMockApp } from "../../../__mocks__/appMock";
const baseDir = join(__dirname, "../../../test/data");
const baseDir = join(__dirname, "../../../../test/data");
const tmpDir = dirSync({
prefix: "query_test_",
@@ -100,7 +100,7 @@ const nullProgressReporter: ProgressReporter = {
},
};
describeWithCodeQL()("using the new query server", () => {
describeWithCodeQL()("using the query server", () => {
let qs: qsClient.QueryServerClient;
let cliServer: cli.CodeQLCliServer;
let db: string;

2
extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/auto-model-codeml-queries.test.ts
View File

@@ -4,7 +4,7 @@ import {
DatabaseKind,
} from "../../../../src/databases/local-databases";
import { file } from "tmp-promise";
import { QueryResultType } from "../../../../src/query-server/new-messages";
import { QueryResultType } from "../../../../src/query-server/messages";
import {
generateCandidateFilterPack,
runAutoModelQueries,

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

@@ -8,7 +8,7 @@ import {
DatabaseKind,
} from "../../../../src/databases/local-databases";
import { dirSync, file } from "tmp-promise";
import { QueryResultType } from "../../../../src/query-server/new-messages";
import { QueryResultType } from "../../../../src/query-server/messages";
import { fetchExternalApiQueries } from "../../../../src/model-editor/queries";
import * as log from "../../../../src/common/logging/notifications";
import { RedactableError } from "../../../../src/common/errors";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/generate.test.ts
View File

@@ -4,7 +4,7 @@ import {
DatabaseKind,
} from "../../../../src/databases/local-databases";
import { file } from "tmp-promise";
import { QueryResultType } from "../../../../src/query-server/new-messages";
import { QueryResultType } from "../../../../src/query-server/messages";
import { mockedObject, mockedUri } from "../../utils/mocking.helpers";
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
import { QueryRunner } from "../../../../src/query-server";

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

@@ -17,7 +17,7 @@ import { QueryEvaluationInfo } from "../../../src/run-queries-shared";
import {
deregisterDatabases,
registerDatabases,
} from "../../../src/query-server/new-messages";
} from "../../../src/query-server/messages";
describe("run-queries", () => {
let isCanarySpy: jest.SpiedFunction<typeof config.isCanary>;