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

Move cli.ts to /codeql-cli/cli.ts

Browse Source
This commit is contained in:
Charis Kyriakou
2023-04-27 09:28:40 +00:00
parent 84f482fcb7
commit 732c67e6cd
66 changed files with 89 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
import * as semver from "semver";
import { runCodeQlCliCommand } from "./cli";
import { runCodeQlCliCommand } from "./codeql-cli/cli";
import { Logger } from "./common";
import { getErrorMessage } from "./pure/helpers-pure";

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

@@ -11,24 +11,24 @@ import tk from "tree-kill";
import { promisify } from "util";
import { CancellationToken, Disposable, Uri } from "vscode";
import { BQRSInfo, DecodedBqrsChunk } from "./pure/bqrs-cli-types";
import { allowCanaryQueryServer, CliConfig } from "./config";
import { BQRSInfo, DecodedBqrsChunk } from "../pure/bqrs-cli-types";
import { allowCanaryQueryServer, CliConfig } from "../config";
import {
DistributionProvider,
FindDistributionResultKind,
} from "./distribution";
} from "../distribution";
import {
assertNever,
getErrorMessage,
getErrorStack,
} from "./pure/helpers-pure";
import { QueryMetadata, SortDirection } from "./pure/interface-types";
import { BaseLogger, Logger, ProgressReporter } from "./common";
import { CompilationMessage } from "./pure/legacy-messages";
import { sarifParser } from "./sarif-parser";
import { walkDirectory } from "./helpers";
import { App } from "./common/app";
import { QueryLanguage } from "./common/query-language";
} from "../pure/helpers-pure";
import { QueryMetadata, SortDirection } from "../pure/interface-types";
import { BaseLogger, Logger, ProgressReporter } from "../common";
import { CompilationMessage } from "../pure/legacy-messages";
import { sarifParser } from "../sarif-parser";
import { walkDirectory } from "../helpers";
import { App } from "../common/app";
import { QueryLanguage } from "../common/query-language";
/**
* The version of the SARIF format that we are using.

2
extensions/ql-vscode/src/compare/compare-view.ts
View File

@@ -6,7 +6,7 @@ import {
QueryCompareResult,
} from "../pure/interface-types";
import { Logger } from "../common";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { DatabaseManager } from "../databases/local-databases";
import { jumpToLocation } from "../interface-utils";
import {

2
extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts
View File

@@ -1,7 +1,7 @@
import { ExtensionContext } from "vscode";
import { DataExtensionsEditorView } from "./data-extensions-editor-view";
import { DataExtensionsEditorCommands } from "../common/commands";
import { CliVersionConstraint, CodeQLCliServer } from "../cli";
import { CliVersionConstraint, CodeQLCliServer } from "../codeql-cli/cli";
import { QueryRunner } from "../query-server";
import { DatabaseManager } from "../databases/local-databases";
import { ensureDir } from "fs-extra";

2
extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts
View File

@@ -22,7 +22,7 @@ import { extLogger } from "../common";
import { outputFile, pathExists, readFile } from "fs-extra";
import { load as loadYaml } from "js-yaml";
import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { asError, assertNever, getErrorMessage } from "../pure/helpers-pure";
import { generateFlowModel } from "./generate-flow-model";
import { promptImportGithubDatabase } from "../databases/database-fetcher";

2
extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts
View File

@@ -3,7 +3,7 @@ import { outputFile, pathExists, readFile } from "fs-extra";
import { dump as dumpYaml, load as loadYaml } from "js-yaml";
import { minimatch } from "minimatch";
import { CancellationToken, window } from "vscode";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import {
getOnDiskWorkspaceFolders,
getOnDiskWorkspaceFoldersObjects,

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

@@ -8,7 +8,7 @@ import {
} from "../helpers";
import { TeeLogger } from "../common";
import { CancellationToken } from "vscode";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { DatabaseItem } from "../databases/local-databases";
import { ProgressCallback } from "../progress";
import { fetchExternalApiQueries } from "./queries";

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

@@ -2,7 +2,7 @@ import { CancellationToken } from "vscode";
import { DatabaseItem } from "../databases/local-databases";
import { join } from "path";
import { QueryRunner } from "../query-server";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { TeeLogger } from "../common";
import { extensiblePredicateDefinitions } from "./predicates";
import { ProgressCallback } from "../progress";

2
extensions/ql-vscode/src/databases/database-fetcher.ts
View File

@@ -2,7 +2,7 @@ import fetch, { Response } from "node-fetch";
import { zip } from "zip-a-folder";
import { Open } from "unzipper";
import { Uri, CancellationToken, window, InputBoxOptions } from "vscode";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import {
ensureDir,
realpath as fs_realpath,

2
extensions/ql-vscode/src/databases/local-databases.ts
View File

@@ -2,7 +2,7 @@ import { pathExists, stat, remove } from "fs-extra";
import { glob } from "glob";
import { join, basename, resolve, relative, dirname, extname } from "path";
import * as vscode from "vscode";
import * as cli from "../cli";
import * as cli from "../codeql-cli/cli";
import { ExtensionContext } from "vscode";
import {
showAndLogWarningMessage,

2
extensions/ql-vscode/src/extension.ts
View File

@@ -24,7 +24,7 @@ import {
activate as archiveFilesystemProvider_activate,
zipArchiveScheme,
} from "./archive-filesystem-provider";
import { CodeQLCliServer } from "./cli";
import { CodeQLCliServer } from "./codeql-cli/cli";
import {
CliConfigListener,
DistributionConfigListener,

2
extensions/ql-vscode/src/helpers.ts
View File

@@ -18,7 +18,7 @@ import {
env,
WorkspaceFolder,
} from "vscode";
import { CodeQLCliServer, QlpacksInfo } from "./cli";
import { CodeQLCliServer, QlpacksInfo } from "./codeql-cli/cli";
import { UserCancellationException } from "./progress";
import { extLogger, OutputChannelLogger } from "./common";
import { QueryMetadata } from "./pure/interface-types";

4
extensions/ql-vscode/src/interface.ts
View File

@@ -10,8 +10,8 @@ import {
env,
WebviewPanel,
} from "vscode";
import * as cli from "./cli";
import { CodeQLCliServer } from "./cli";
import * as cli from "./codeql-cli/cli";
import { CodeQLCliServer } from "./codeql-cli/cli";
import {
DatabaseEventKind,
DatabaseItem,

2
extensions/ql-vscode/src/language-support/ast-viewer/ast-builder.ts
View File

@@ -1,4 +1,4 @@
import { CodeQLCliServer } from "../../cli";
import { CodeQLCliServer } from "../../codeql-cli/cli";
import {
DecodedBqrsChunk,
BqrsId,

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

@@ -8,7 +8,7 @@ import {
getResultSetSchema,
ResultSetSchema,
} from "../../pure/bqrs-cli-types";
import { CodeQLCliServer } from "../../cli";
import { CodeQLCliServer } from "../../codeql-cli/cli";
import { DatabaseManager, DatabaseItem } from "../../databases/local-databases";
import { ProgressCallback } from "../../progress";
import { KeyType } from "./key-type";

2
extensions/ql-vscode/src/language-support/contextual/query-resolver.ts
View File

@@ -16,7 +16,7 @@ import {
nameOfKeyType,
tagOfKeyType,
} from "./key-type";
import { CodeQLCliServer } from "../../cli";
import { CodeQLCliServer } from "../../codeql-cli/cli";
import { DatabaseItem } from "../../databases/local-databases";
import { extLogger, TeeLogger } from "../../common";
import { CancellationToken } from "vscode";

2
extensions/ql-vscode/src/language-support/contextual/template-provider.ts
View File

@@ -15,7 +15,7 @@ import {
encodeArchiveBasePath,
zipArchiveScheme,
} from "../../archive-filesystem-provider";
import { CodeQLCliServer } from "../../cli";
import { CodeQLCliServer } from "../../codeql-cli/cli";
import { DatabaseManager } from "../../databases/local-databases";
import { CachedOperation } from "../../helpers";
import { ProgressCallback, withProgress } from "../../progress";

2
extensions/ql-vscode/src/language-support/ide-server.ts
View File

@@ -1,6 +1,6 @@
import { ProgressLocation, window } from "vscode";
import { StreamInfo } from "vscode-languageclient/node";
import { shouldDebugIdeServer, spawnServer } from "../cli";
import { shouldDebugIdeServer, spawnServer } from "../codeql-cli/cli";
import { QueryServerConfig } from "../config";
import { ideServerLogger } from "../common";

2
extensions/ql-vscode/src/language-support/query-editor.ts
View File

@@ -1,5 +1,5 @@
import { Uri, window } from "vscode";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { QueryRunner } from "../query-server";
import { basename, join } from "path";
import { getErrorMessage } from "../pure/helpers-pure";

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

@@ -37,7 +37,7 @@ import {
import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
import { WebviewReveal } from "../interface-utils";
import { asError, getErrorMessage } from "../pure/helpers-pure";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { LocalQueryCommands } from "../common/commands";
import { App } from "../common/app";
import { DisposableObject } from "../pure/disposable-object";

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

@@ -17,7 +17,7 @@ import {
} from "../run-queries-shared";
import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
import { WebviewReveal } from "../interface-utils";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { QueryResultType } from "../pure/new-messages";
import { redactableError } from "../pure/errors";
import { LocalQueries } from "./local-queries";

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

@@ -3,7 +3,7 @@ import { dump, load } from "js-yaml";
import { basename, join } from "path";
import { CancellationToken, window as Window, workspace, Uri } from "vscode";
import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { DatabaseUI } from "../databases/local-databases-ui";
import {
getInitialQueryContents,

2
extensions/ql-vscode/src/packaging/packaging.ts
View File

@@ -1,4 +1,4 @@
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import {
getOnDiskWorkspaceFolders,
showAndLogExceptionWithTelemetry,

2
extensions/ql-vscode/src/qlpack-generator.ts
View File

@@ -2,7 +2,7 @@ import { mkdir, writeFile } from "fs-extra";
import { dump } from "js-yaml";
import { join } from "path";
import { Uri } from "vscode";
import { CodeQLCliServer } from "./cli";
import { CodeQLCliServer } from "./codeql-cli/cli";
import { QueryLanguage } from "./common/query-language";
export class QlPackGenerator {

2
extensions/ql-vscode/src/qltest-discovery.ts
View File

@@ -9,7 +9,7 @@ import {
env,
} from "vscode";
import { MultiFileSystemWatcher } from "./vscode-utils/multi-file-system-watcher";
import { CodeQLCliServer } from "./cli";
import { CodeQLCliServer } from "./codeql-cli/cli";
import { pathExists } from "fs-extra";
/**

2
extensions/ql-vscode/src/query-history/query-history-manager.ts
View File

@@ -40,7 +40,7 @@ import {
} from "../query-status";
import { readQueryHistoryFromFile, writeQueryHistoryToFile } from "./store";
import { pathExists } from "fs-extra";
import { CliVersionConstraint } from "../cli";
import { CliVersionConstraint } from "../codeql-cli/cli";
import { HistoryItemLabelProvider } from "./history-item-label-provider";
import { ResultsView } from "../interface";
import { WebviewReveal } from "../interface-utils";

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

@@ -2,7 +2,7 @@ import { CancellationTokenSource, env } from "vscode";
import * as messages from "./pure/messages-shared";
import * as legacyMessages from "./pure/legacy-messages";
import * as cli from "./cli";
import * as cli from "./codeql-cli/cli";
import { pathExists } from "fs-extra";
import { basename } from "path";
import {

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

@@ -1,5 +1,5 @@
import { CancellationToken } from "vscode";
import { CodeQLCliServer } from "../../cli";
import { CodeQLCliServer } from "../../codeql-cli/cli";
import { ProgressCallback } from "../../progress";
import { Logger } from "../../common";
import { DatabaseItem } from "../../databases/local-databases";

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

@@ -3,7 +3,7 @@ import { ensureFile } from "fs-extra";
import { DisposableObject } from "../../pure/disposable-object";
import { CancellationToken } from "vscode";
import { createMessageConnection, RequestType } from "vscode-jsonrpc/node";
import * as cli from "../../cli";
import * as cli from "../../codeql-cli/cli";
import { QueryServerConfig } from "../../config";
import { Logger, ProgressReporter } from "../../common";
import {

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

@@ -3,7 +3,7 @@ import { basename } from "path";
import { CancellationToken, Uri } from "vscode";
import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
import * as cli from "../../cli";
import * as cli from "../../codeql-cli/cli";
import {
DatabaseContentsWithDbScheme,
DatabaseItem,

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

@@ -14,7 +14,7 @@ import { QueryServerClient } from "./query-server-client";
import { compileAndRunQueryAgainstDatabaseCore } from "./run-queries";
import * as vscode from "vscode";
import { getOnDiskWorkspaceFolders } from "../helpers";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { Logger } from "../common";
import { QueryOutputDir } from "../run-queries-shared";

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

@@ -1,5 +1,5 @@
import { CancellationToken } from "vscode";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { ProgressCallback } from "../progress";
import { DatabaseItem } from "../databases/local-databases";
import { QueryOutputDir } from "../run-queries-shared";

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

@@ -3,7 +3,7 @@ import { ensureFile } from "fs-extra";
import { DisposableObject, DisposeHandler } from "../pure/disposable-object";
import { CancellationToken } from "vscode";
import { createMessageConnection, RequestType } from "vscode-jsonrpc/node";
import * as cli from "../cli";
import * as cli from "../codeql-cli/cli";
import { QueryServerConfig } from "../config";
import { Logger, ProgressReporter } from "../common";
import {

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

@@ -23,7 +23,7 @@ import {
import { ensureMetadataIsComplete, InitialQueryInfo } from "./query-results";
import { isQuickQueryPath } from "./local-queries";
import { nanoid } from "nanoid";
import { CodeQLCliServer } from "./cli";
import { CodeQLCliServer } from "./codeql-cli/cli";
import { SELECT_QUERY_NAME } from "./language-support";
import { DatabaseManager } from "./databases/local-databases";
import { DecodedBqrsChunk, EntityValue } from "./pure/bqrs-cli-types";

2
extensions/ql-vscode/src/skeleton-query-wizard.ts
View File

@@ -1,6 +1,6 @@
import { join } from "path";
import { CancellationToken, Uri, workspace, window as Window } from "vscode";
import { CodeQLCliServer } from "./cli";
import { CodeQLCliServer } from "./codeql-cli/cli";
import { OutputChannelLogger } from "./common";
import { Credentials } from "./common/authentication";
import { QueryLanguage } from "./common/query-language";

2
extensions/ql-vscode/src/status-bar.ts
View File

@@ -5,7 +5,7 @@ import {
window,
workspace,
} from "vscode";
import { CodeQLCliServer } from "./cli";
import { CodeQLCliServer } from "./codeql-cli/cli";
import {
CANARY_FEATURES,
CUSTOM_CODEQL_PATH_SETTING,

2
extensions/ql-vscode/src/test-adapter.ts
View File

@@ -21,7 +21,7 @@ import {
} from "./qltest-discovery";
import { Event, EventEmitter, CancellationTokenSource } from "vscode";
import { DisposableObject } from "./pure/disposable-object";
import { CodeQLCliServer, TestCompleted } from "./cli";
import { CodeQLCliServer, TestCompleted } from "./codeql-cli/cli";
import { testLogger } from "./common";
import { TestRunner } from "./test-runner";

2
extensions/ql-vscode/src/test-manager.ts
View File

@@ -22,7 +22,7 @@ import {
QLTestFile,
QLTestNode,
} from "./qltest-discovery";
import { CodeQLCliServer } from "./cli";
import { CodeQLCliServer } from "./codeql-cli/cli";
import { getErrorMessage } from "./pure/helpers-pure";
import { BaseLogger, LogOptions } from "./common";
import { TestRunner } from "./test-runner";

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

@@ -1,5 +1,5 @@
import { CancellationToken, Uri } from "vscode";
import { CodeQLCliServer, TestCompleted } from "./cli";
import { CodeQLCliServer, TestCompleted } from "./codeql-cli/cli";
import { DatabaseItem, DatabaseManager } from "./databases/local-databases";
import {
getOnDiskWorkspaceFolders,

2
extensions/ql-vscode/src/variant-analysis/bqrs-processing.ts
View File

@@ -1,4 +1,4 @@
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { Logger } from "../common";
import { transformBqrsResultSet } from "../pure/bqrs-cli-types";
import { AnalysisRawResults } from "./shared/analysis-result";

2
extensions/ql-vscode/src/variant-analysis/run-remote-query.ts
View File

@@ -11,7 +11,7 @@ import {
tmpDir,
} from "../helpers";
import { Credentials } from "../common/authentication";
import * as cli from "../cli";
import * as cli from "../codeql-cli/cli";
import { extLogger } from "../common";
import {
getActionBranch,

2
extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts
View File

@@ -55,7 +55,7 @@ import {
UserCancellationException,
withProgress,
} from "../progress";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import {
defaultFilterSortState,
filterAndSortRepositoriesWithResults,

2
extensions/ql-vscode/src/variant-analysis/variant-analysis-results-manager.ts
View File

@@ -7,7 +7,7 @@ import { Logger } from "../common";
import { AnalysisAlert, AnalysisRawResults } from "./shared/analysis-result";
import { sarifParser } from "../sarif-parser";
import { extractAnalysisAlerts } from "./sarif-processing";
import { CodeQLCliServer } from "../cli";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { extractRawResults } from "./bqrs-processing";
import {
VariantAnalysis,

2
extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts
View File

@@ -17,7 +17,7 @@ import * as fetchModule from "node-fetch";
import { Response } from "node-fetch";
import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
import { CodeQLCliServer } from "../../../../src/cli";
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
import { getActivatedExtension, storagePath } from "../../global.helper";
import { VariantAnalysisResultsManager } from "../../../../src/variant-analysis/variant-analysis-results-manager";
import { createMockVariantAnalysis } from "../../../factories/variant-analysis/shared/variant-analysis";

2
extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-results-manager.test.ts
View File

@@ -6,7 +6,7 @@ import * as fetchModule from "node-fetch";
import { RequestInfo, RequestInit, Response } from "node-fetch";
import { VariantAnalysisResultsManager } from "../../../../src/variant-analysis/variant-analysis-results-manager";
import { CodeQLCliServer } from "../../../../src/cli";
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
import { storagePath } from "../../global.helper";
import { faker } from "@faker-js/faker";
import { createMockVariantAnalysisRepositoryTask } from "../../../factories/variant-analysis/shared/variant-analysis-repo-tasks";

2
extensions/ql-vscode/test/vscode-tests/cli-integration/databases/database-fetcher.test.ts
View File

@@ -1,7 +1,7 @@
import { join } from "path";
import { CancellationToken, Uri, window } from "vscode";
import { CodeQLCliServer } from "../../../../src/cli";
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
import { DatabaseManager } from "../../../../src/databases/local-databases";
import {
importArchiveDatabase,

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

@@ -9,7 +9,7 @@ import {
} from "../../global.helper";
import { describeWithCodeQL } from "../../cli";
import { withDebugController } from "./debug-controller";
import { CodeQLCliServer } from "../../../../src/cli";
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
import { QueryOutputDir } from "../../../../src/run-queries-shared";
import { createVSCodeCommandManager } from "../../../../src/common/vscode/commands";
import { AllCommands } from "../../../../src/common/commands";

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

@@ -1,6 +1,6 @@
import { join } from "path";
import { CodeQLCliServer } from "../../../src/cli";
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
import { tryGetQueryMetadata } from "../../../src/helpers";
import { getActivatedExtension } from "../global.helper";

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

@@ -5,7 +5,7 @@ import { pathToFileURL } from "url";
import { CancellationTokenSource } from "vscode-jsonrpc";
import * as messages from "../../../src/pure/legacy-messages";
import * as qsClient from "../../../src/query-server/legacy/query-server-client";
import * as cli from "../../../src/cli";
import * as cli from "../../../src/codeql-cli/cli";
import { CellValue } from "../../../src/pure/bqrs-cli-types";
import { describeWithCodeQL } from "../cli";
import { QueryServerClient } from "../../../src/query-server/legacy/query-server-client";

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

@@ -3,7 +3,7 @@ import { dirSync } from "tmp";
import { CancellationTokenSource } from "vscode-jsonrpc";
import * as messages from "../../../src/pure/new-messages";
import * as qsClient from "../../../src/query-server/query-server-client";
import * as cli from "../../../src/cli";
import * as cli from "../../../src/codeql-cli/cli";
import { CellValue } from "../../../src/pure/bqrs-cli-types";
import { describeWithCodeQL } from "../cli";
import { QueryServerClient } from "../../../src/query-server/query-server-client";

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

@@ -1,7 +1,7 @@
import { window } from "vscode";
import { join } from "path";
import { CodeQLCliServer } from "../../../../src/cli";
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
import { getErrorMessage } from "../../../../src/pure/helpers-pure";
import * as helpers from "../../../../src/helpers";

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

@@ -18,7 +18,10 @@ import {
ensureTestDatabase,
getActivatedExtension,
} from "../global.helper";
import { CliVersionConstraint, CodeQLCliServer } from "../../../src/cli";
import {
CliVersionConstraint,
CodeQLCliServer,
} from "../../../src/codeql-cli/cli";
import { describeWithCodeQL } from "../cli";
import {
CoreCompletedQuery,

5
extensions/ql-vscode/test/vscode-tests/cli-integration/run-cli.test.ts
View File

@@ -2,7 +2,10 @@ import { authentication, Uri } from "vscode";
import { join } from "path";
import { SemVer } from "semver";
import { CodeQLCliServer, QueryInfoByLanguage } from "../../../src/cli";
import {
CodeQLCliServer,
QueryInfoByLanguage,
} from "../../../src/codeql-cli/cli";
import { itWithCodeQL } from "../cli";
import {
getOnDiskWorkspaceFolders,

2
extensions/ql-vscode/test/vscode-tests/cli-integration/skeleton-query-wizard.test.ts
View File

@@ -1,4 +1,4 @@
import { CodeQLCliServer } from "../../../src/cli";
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
import {
QUERY_LANGUAGE_TO_DATABASE_REPO,
SkeletonQueryWizard,

5
extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts
View File

@@ -5,7 +5,10 @@ import * as ghApiClient from "../../../../src/variant-analysis/gh-api/gh-api-cli
import { join } from "path";
import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
import { CliVersionConstraint, CodeQLCliServer } from "../../../../src/cli";
import {
CliVersionConstraint,
CodeQLCliServer,
} from "../../../../src/codeql-cli/cli";
import {
fixWorkspaceReferences,
getActivatedExtension,

2
extensions/ql-vscode/test/vscode-tests/global.helper.ts
View File

@@ -11,7 +11,7 @@ import {
DatabaseItem,
DatabaseManager,
} from "../../src/databases/local-databases";
import { CodeQLCliServer } from "../../src/cli";
import { CodeQLCliServer } from "../../src/codeql-cli/cli";
import { removeWorkspaceRefs } from "../../src/variant-analysis/run-remote-query";
import { CodeQLExtensionInterface } from "../../src/extension";
import { ProgressCallback } from "../../src/progress";

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

@@ -14,7 +14,7 @@ import {
} from "../../../src/databases/local-databases";
import { Logger } from "../../../src/common";
import { ProgressCallback } from "../../../src/progress";
import { CodeQLCliServer, DbInfo } from "../../../src/cli";
import { CodeQLCliServer, DbInfo } from "../../../src/codeql-cli/cli";
import {
encodeArchiveBasePath,
encodeSourceArchiveUri,

2
extensions/ql-vscode/test/vscode-tests/minimal-workspace/qlpack-generator.test.ts
View File

@@ -2,7 +2,7 @@ import { join } from "path";
import { existsSync } from "fs";
import { QlPackGenerator } from "../../../src/qlpack-generator";
import { QueryLanguage } from "../../../src/common/query-language";
import { CodeQLCliServer } from "../../../src/cli";
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
import { Uri, workspace } from "vscode";
import { getErrorMessage } from "../../../src/pure/helpers-pure";
import * as tmp from "tmp";

5
extensions/ql-vscode/test/vscode-tests/no-workspace/data-extensions-editor/extension-pack-picker.test.ts
View File

@@ -3,7 +3,10 @@ import { dump as dumpYaml, load as loadYaml } from "js-yaml";
import { outputFile, readFile } from "fs-extra";
import { join } from "path";
import { dir } from "tmp-promise";
import { QlpacksInfo, ResolveExtensionsResult } from "../../../../src/cli";
import {
QlpacksInfo,
ResolveExtensionsResult,
} from "../../../../src/codeql-cli/cli";
import * as helpers from "../../../../src/helpers";
import { pickExtensionPackModelFile } from "../../../../src/data-extensions-editor/extension-pack-picker";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/ast-viewer/ast-builder.test.ts
View File

@@ -1,6 +1,6 @@
import { readFileSync } from "fs-extra";
import { CodeQLCliServer } from "../../../../../src/cli";
import { CodeQLCliServer } from "../../../../../src/codeql-cli/cli";
import { Uri } from "vscode";
import { QueryOutputDir } from "../../../../../src/run-queries-shared";
import { mockDatabaseItem, mockedObject } from "../../../utils/mocking.helpers";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/contextual/query-resolver.test.ts
View File

@@ -9,7 +9,7 @@ import {
qlpackOfDatabase,
resolveQueries,
} from "../../../../../src/language-support";
import { CodeQLCliServer } from "../../../../../src/cli";
import { CodeQLCliServer } from "../../../../../src/codeql-cli/cli";
import { mockDatabaseItem, mockedObject } from "../../../utils/mocking.helpers";
describe("queryResolver", () => {

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

@@ -18,7 +18,7 @@ import {
SortDirection,
SortedResultSetInfo,
} from "../../../src/pure/interface-types";
import { CodeQLCliServer, SourceInfo } from "../../../src/cli";
import { CodeQLCliServer, SourceInfo } from "../../../src/codeql-cli/cli";
import { CancellationTokenSource, Uri } from "vscode";
import { tmpDir } from "../../../src/helpers";
import {

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

@@ -10,7 +10,7 @@ import {
} from "../../../src/pure/legacy-messages";
import * as config from "../../../src/config";
import { tmpDir } from "../../../src/helpers";
import { CodeQLCliServer } from "../../../src/cli";
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
import { SELECT_QUERY_NAME } from "../../../src/language-support";
import {
QueryInProgress,

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

@@ -11,7 +11,7 @@ import {
} from "vscode";
import { QLTestAdapter } from "../../../src/test-adapter";
import { CodeQLCliServer } from "../../../src/cli";
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
import { DatabaseManager } from "../../../src/databases/local-databases";
import { mockedObject } from "../utils/mocking.helpers";
import { TestRunner } from "../../../src/test-runner";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/test-runner-helpers.ts
View File

@@ -1,6 +1,6 @@
import { Uri } from "vscode";
import { mockedObject } from "../utils/mocking.helpers";
import { CodeQLCliServer } from "../../../src/cli";
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
import { DatabaseManager } from "../../../src/databases/local-databases";
/**

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

@@ -1,5 +1,5 @@
import { CancellationTokenSource, Uri } from "vscode";
import { CodeQLCliServer } from "../../../src/cli";
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
import {
DatabaseItem,
DatabaseItemImpl,