Skip to content

Commit d4fa420

Browse files
authored
Merge pull request github#2357 from github/charisk-nora/query-server-move
Move Query Server files
2 parents fbe782f + d9dc061 commit d4fa420

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+370
-352
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 "../queryRunner";
23+
import { QueryRunner } from "../query-server";
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 "../queryRunner";
19+
import { CoreCompletedQuery, QueryRunner } from "../query-server";
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 "../queryRunner";
35+
import { CoreCompletedQuery, QueryRunner } from "../query-server";
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 "../queryRunner";
5+
import { QueryRunner } from "../query-server";
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 "../queryRunner";
16+
import { QueryRunner } from "../query-server";
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 "../queryRunner";
1+
import { CoreCompletedQuery, QueryRunner } from "../query-server";
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 "../queryRunner";
4+
import { QueryRunner } from "../query-server";
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
@@ -14,7 +14,7 @@ import { Disposable } from "vscode";
1414
import { CancellationTokenSource } from "vscode-jsonrpc";
1515
import { BaseLogger, LogOptions, queryServerLogger } from "../common";
1616
import { QueryResultType } from "../pure/new-messages";
17-
import { CoreQueryResults, CoreQueryRun, QueryRunner } from "../queryRunner";
17+
import { CoreQueryResults, CoreQueryRun, QueryRunner } from "../query-server";
1818
import * as CodeQLProtocol from "./debug-protocol";
1919
import { QuickEvalContext } from "../run-queries-shared";
2020
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 "../queryRunner";
14+
import { QueryRunner } from "../query-server";
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 "../queryRunner";
13+
import { CoreQueryResults } from "../query-server";
1414
import {
1515
getQuickEvalContext,
1616
QueryOutputDir,

0 commit comments

Comments
 (0)