Skip to content

Commit 5cfb939

Browse files
committed
Rename legacyRunner to query-runner (kebab-case)
1 parent f97105b commit 5cfb939

28 files changed

+31
-27
lines changed

extensions/ql-vscode/src/contextual/locationFinder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from "./queryResolver";
2121
import { CancellationToken, LocationLink, Uri } from "vscode";
2222
import { QueryOutputDir } from "../run-queries-shared";
23-
import { QueryRunner } from "../query-server/queryRunner";
23+
import { QueryRunner } from "../query-server/query-runner";
2424
import { QueryResultType } from "../pure/new-messages";
2525

2626
export const SELECT_QUERY_NAME = "#select";

extensions/ql-vscode/src/contextual/queryResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { DatabaseItem } from "../local-databases";
1616
import { extLogger, TeeLogger } from "../common";
1717
import { CancellationToken } from "vscode";
1818
import { ProgressCallback } from "../progress";
19-
import { CoreCompletedQuery, QueryRunner } from "../query-server/queryRunner";
19+
import { CoreCompletedQuery, QueryRunner } from "../query-server/query-runner";
2020
import { redactableError } from "../pure/errors";
2121
import { QLPACK_FILENAMES } from "../pure/ql";
2222

extensions/ql-vscode/src/contextual/templateProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
runContextualQuery,
3333
} from "./queryResolver";
3434
import { isCanary, NO_CACHE_AST_VIEWER } from "../config";
35-
import { CoreCompletedQuery, QueryRunner } from "../query-server/queryRunner";
35+
import { CoreCompletedQuery, QueryRunner } from "../query-server/query-runner";
3636

3737
/**
3838
* Runs templated CodeQL queries to find definitions in

extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ExtensionContext } from "vscode";
22
import { DataExtensionsEditorView } from "./data-extensions-editor-view";
33
import { DataExtensionsEditorCommands } from "../common/commands";
44
import { CliVersionConstraint, CodeQLCliServer } from "../cli";
5-
import { QueryRunner } from "../query-server/queryRunner";
5+
import { QueryRunner } from "../query-server/query-runner";
66
import { DatabaseManager } from "../local-databases";
77
import { ensureDir } from "fs-extra";
88
import { join } from "path";

extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
ToDataExtensionsEditorMessage,
1414
} from "../pure/interface-types";
1515
import { ProgressUpdate } from "../progress";
16-
import { QueryRunner } from "../query-server/queryRunner";
16+
import { QueryRunner } from "../query-server/query-runner";
1717
import {
1818
showAndLogErrorMessage,
1919
showAndLogExceptionWithTelemetry,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CoreCompletedQuery, QueryRunner } from "../query-server/queryRunner";
1+
import { CoreCompletedQuery, QueryRunner } from "../query-server/query-runner";
22
import { dir } from "tmp-promise";
33
import { writeFile } from "fs-extra";
44
import { dump as dumpYaml } from "js-yaml";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { CancellationToken } from "vscode";
22
import { DatabaseItem } from "../local-databases";
33
import { join } from "path";
4-
import { QueryRunner } from "../query-server/queryRunner";
4+
import { QueryRunner } from "../query-server/query-runner";
55
import { CodeQLCliServer } from "../cli";
66
import { TeeLogger } from "../common";
77
import { extensiblePredicateDefinitions } from "./predicates";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
CoreQueryResults,
1919
CoreQueryRun,
2020
QueryRunner,
21-
} from "../query-server/queryRunner";
21+
} from "../query-server/query-runner";
2222
import * as CodeQLProtocol from "./debug-protocol";
2323
import { QuickEvalContext } from "../run-queries-shared";
2424
import { getErrorMessage } from "../pure/helpers-pure";

extensions/ql-vscode/src/debugger/debugger-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import { isCanary } from "../config";
1212
import { LocalQueries } from "../local-queries";
1313
import { DisposableObject } from "../pure/disposable-object";
14-
import { QueryRunner } from "../query-server/queryRunner";
14+
import { QueryRunner } from "../query-server/query-runner";
1515
import { QLDebugConfigurationProvider } from "./debug-configuration";
1616
import { QLDebugSession } from "./debug-session";
1717

extensions/ql-vscode/src/debugger/debugger-ui.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
import { DebuggerCommands } from "../common/commands";
1111
import { DatabaseManager } from "../local-databases";
1212
import { DisposableObject } from "../pure/disposable-object";
13-
import { CoreQueryResults } from "../query-server/queryRunner";
13+
import { CoreQueryResults } from "../query-server/query-runner";
1414
import {
1515
getQuickEvalContext,
1616
QueryOutputDir,

extensions/ql-vscode/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ import { JoinOrderScannerProvider } from "./log-insights/join-order";
9999
import { LogScannerService } from "./log-insights/log-scanner-service";
100100
import { LegacyQueryRunner } from "./query-server/legacy/legacy-query-runner";
101101
import { NewQueryRunner } from "./query-server/new-query-runner";
102-
import { QueryRunner } from "./query-server/queryRunner";
102+
import { QueryRunner } from "./query-server/query-runner";
103103
import { VariantAnalysisView } from "./variant-analysis/variant-analysis-view";
104104
import { VariantAnalysisViewSerializer } from "./variant-analysis/variant-analysis-view-serializer";
105105
import { VariantAnalysisManager } from "./variant-analysis/variant-analysis-manager";

extensions/ql-vscode/src/local-databases-ui.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import {
4141
promptImportInternetDatabase,
4242
} from "./databaseFetcher";
4343
import { asError, asyncFilter, getErrorMessage } from "./pure/helpers-pure";
44-
import { QueryRunner } from "./query-server/queryRunner";
44+
import { QueryRunner } from "./query-server/query-runner";
4545
import { isCanary } from "./config";
4646
import { App } from "./common/app";
4747
import { redactableError } from "./pure/errors";

extensions/ql-vscode/src/local-databases.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
import { DisposableObject } from "./pure/disposable-object";
2424
import { Logger, extLogger } from "./common";
2525
import { asError, getErrorMessage } from "./pure/helpers-pure";
26-
import { QueryRunner } from "./query-server/queryRunner";
26+
import { QueryRunner } from "./query-server/query-runner";
2727
import { pathsEqual } from "./pure/files";
2828
import { redactableError } from "./pure/errors";
2929
import { isCodespacesTemplate } from "./config";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
showBinaryChoiceDialog,
2222
} from "../helpers";
2323
import { displayQuickQuery } from "../quick-query";
24-
import { CoreCompletedQuery, QueryRunner } from "../query-server/queryRunner";
24+
import { CoreCompletedQuery, QueryRunner } from "../query-server/query-runner";
2525
import { QueryHistoryManager } from "../query-history/query-history-manager";
2626
import { DatabaseUI } from "../local-databases-ui";
2727
import { ResultsView } from "../interface";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
showAndLogWarningMessage,
55
tryGetQueryMetadata,
66
} from "../helpers";
7-
import { CoreQueryResults } from "../query-server/queryRunner";
7+
import { CoreQueryResults } from "../query-server/query-runner";
88
import { QueryHistoryManager } from "../query-history/query-history-manager";
99
import { DatabaseItem } from "../local-databases";
1010
import {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Uri, window } from "vscode";
22
import { CodeQLCliServer } from "./cli";
3-
import { QueryRunner } from "./query-server/queryRunner";
3+
import { QueryRunner } from "./query-server/query-runner";
44
import { basename, join } from "path";
55
import { getErrorMessage } from "./pure/helpers-pure";
66
import { redactableError } from "./pure/errors";

extensions/ql-vscode/src/query-history/query-history-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import { EvalLogViewer } from "../eval-log-viewer";
4949
import EvalLogTreeBuilder from "../eval-log-tree-builder";
5050
import { EvalLogData, parseViewerData } from "../pure/log-summary-parser";
5151
import { QueryWithResults } from "../run-queries-shared";
52-
import { QueryRunner } from "../query-server/queryRunner";
52+
import { QueryRunner } from "../query-server/query-runner";
5353
import { VariantAnalysisManager } from "../variant-analysis/variant-analysis-manager";
5454
import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
5555
import { getTotalResultCount } from "../variant-analysis/shared/variant-analysis";

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ import {
88
deregisterDatabases,
99
registerDatabases,
1010
} from "../../pure/legacy-messages";
11-
import { CoreQueryResults, CoreQueryTarget, QueryRunner } from "../queryRunner";
11+
import {
12+
CoreQueryResults,
13+
CoreQueryTarget,
14+
QueryRunner,
15+
} from "../query-runner";
1216
import { QueryOutputDir } from "../../run-queries-shared";
1317
import { QueryServerClient } from "./query-server-client";
1418
import {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { asError, getErrorMessage } from "../../pure/helpers-pure";
2424
import { compileDatabaseUpgradeSequence } from "./upgrades";
2525
import { QueryEvaluationInfo, QueryOutputDir } from "../../run-queries-shared";
2626
import { redactableError } from "../../pure/errors";
27-
import { CoreQueryResults, CoreQueryTarget } from "../queryRunner";
27+
import { CoreQueryResults, CoreQueryTarget } from "../query-runner";
2828
import { Position } from "../../pure/messages-shared";
2929

3030
export async function compileQuery(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
registerDatabases,
1010
upgradeDatabase,
1111
} from "../pure/new-messages";
12-
import { CoreQueryResults, CoreQueryTarget, QueryRunner } from "./queryRunner";
12+
import { CoreQueryResults, CoreQueryTarget, QueryRunner } from "./query-runner";
1313
import { QueryServerClient } from "./query-server-client";
1414
import { compileAndRunQueryAgainstDatabaseCore } from "./run-queries";
1515
import * as vscode from "vscode";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ProgressCallback } from "../progress";
33
import * as messages from "../pure/new-messages";
44
import { QueryOutputDir } from "../run-queries-shared";
55
import * as qsClient from "./query-server-client";
6-
import { CoreQueryResults, CoreQueryTarget } from "./queryRunner";
6+
import { CoreQueryResults, CoreQueryTarget } from "./query-runner";
77
import { Logger } from "../common";
88

99
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
import * as CodeQLProtocol from "../../../../src/debugger/debug-protocol";
1111
import { DisposableObject } from "../../../../src/pure/disposable-object";
1212
import { QueryResultType } from "../../../../src/pure/legacy-messages";
13-
import { CoreCompletedQuery } from "../../../../src/query-server/queryRunner";
13+
import { CoreCompletedQuery } from "../../../../src/query-server/query-runner";
1414
import { QueryOutputDir } from "../../../../src/run-queries-shared";
1515
import {
1616
QLDebugArgs,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { describeWithCodeQL } from "../cli";
2020
import {
2121
CoreCompletedQuery,
2222
QueryRunner,
23-
} from "../../../src/query-server/queryRunner";
23+
} from "../../../src/query-server/query-runner";
2424
import { SELECT_QUERY_NAME } from "../../../src/contextual/locationFinder";
2525
import { LocalQueries } from "../../../src/local-queries";
2626
import { QueryResultType } from "../../../src/pure/new-messages";

extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
encodeSourceArchiveUri,
2121
} from "../../../src/archive-filesystem-provider";
2222
import { testDisposeHandler } from "../test-dispose-handler";
23-
import { QueryRunner } from "../../../src/query-server/queryRunner";
23+
import { QueryRunner } from "../../../src/query-server/query-runner";
2424
import * as helpers from "../../../src/helpers";
2525
import { Setting } from "../../../src/config";
2626
import { QlPackGenerator } from "../../../src/qlpack-generator";

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { tmpDir } from "../../../../src/helpers";
99
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
1010
import { ResultsView } from "../../../../src/interface";
1111
import { EvalLogViewer } from "../../../../src/eval-log-viewer";
12-
import { QueryRunner } from "../../../../src/query-server/queryRunner";
12+
import { QueryRunner } from "../../../../src/query-server/query-runner";
1313
import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
1414
import { QueryHistoryInfo } from "../../../../src/query-history/query-history-info";
1515
import {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { tmpDir } from "../../../../src/helpers";
1010
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
1111
import { ResultsView } from "../../../../src/interface";
1212
import { EvalLogViewer } from "../../../../src/eval-log-viewer";
13-
import { QueryRunner } from "../../../../src/query-server/queryRunner";
13+
import { QueryRunner } from "../../../../src/query-server/query-runner";
1414
import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
1515
import { QueryHistoryInfo } from "../../../../src/query-history/query-history-info";
1616
import {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { testDisposeHandler } from "../../test-dispose-handler";
1616
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
1717
import { ResultsView } from "../../../../src/interface";
1818
import { EvalLogViewer } from "../../../../src/eval-log-viewer";
19-
import { QueryRunner } from "../../../../src/query-server/queryRunner";
19+
import { QueryRunner } from "../../../../src/query-server/query-runner";
2020
import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
2121
import { QueryHistoryManager } from "../../../../src/query-history/query-history-manager";
2222
import { mockedObject } from "../../utils/mocking.helpers";

0 commit comments

Comments
 (0)