Merge pull request #2381 from github/charisk/move-cli-files

Move CodeQL CLI files

Author: charisk

extensions/ql-vscode/src/cli-version.ts …/ql-vscode/src/codeql-cli/cli-version.tsextensions/ql-vscode/src/cli-version.ts renamed to extensions/ql-vscode/src/codeql-cli/cli-version.ts extensions/ql-vscode/src/cli-version.ts renamed to extensions/ql-vscode/src/codeql-cli/cli-version.ts

@@ -1,7 +1,7 @@
 import * as semver from "semver";
 import { runCodeQlCliCommand } from "./cli";
-import { Logger } from "./common";
-import { getErrorMessage } from "./pure/helpers-pure";
+import { Logger } from "../common";
+import { getErrorMessage } from "../pure/helpers-pure";
 
 /**
  * Get the version of a CodeQL CLI.

extensions/ql-vscode/src/cli.ts …tensions/ql-vscode/src/codeql-cli/cli.tsextensions/ql-vscode/src/cli.ts renamed to extensions/ql-vscode/src/codeql-cli/cli.ts extensions/ql-vscode/src/cli.ts renamed to extensions/ql-vscode/src/codeql-cli/cli.ts

@@ -11,8 +11,8 @@ 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,
@@ -21,14 +21,14 @@ 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.

extensions/ql-vscode/src/distribution.ts …ql-vscode/src/codeql-cli/distribution.tsextensions/ql-vscode/src/distribution.ts renamed to extensions/ql-vscode/src/codeql-cli/distribution.ts extensions/ql-vscode/src/distribution.ts renamed to extensions/ql-vscode/src/codeql-cli/distribution.ts

@@ -5,22 +5,22 @@ import { delimiter, dirname, join } from "path";
 import * as semver from "semver";
 import { parse } from "url";
 import { ExtensionContext, Event } from "vscode";
-import { DistributionConfig } from "./config";
+import { DistributionConfig } from "../config";
 import {
   InvocationRateLimiter,
   InvocationRateLimiterResultKind,
   showAndLogErrorMessage,
   showAndLogWarningMessage,
-} from "./helpers";
-import { extLogger } from "./common";
+} from "../helpers";
+import { extLogger } from "../common";
 import { getCodeQlCliVersion } from "./cli-version";
-import { ProgressCallback, reportStreamProgress } from "./progress";
+import { ProgressCallback, reportStreamProgress } from "../progress";
 import {
   codeQlLauncherName,
   deprecatedCodeQlLauncherName,
   extractZipArchive,
   getRequiredAssetName,
-} from "./pure/distribution";
+} from "../pure/distribution";
 
 /**
  * distribution.ts

extensions/ql-vscode/src/compare/compare-view.ts

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

extensions/ql-vscode/src/config.ts

@@ -6,7 +6,7 @@ import {
   ConfigurationChangeEvent,
   ConfigurationTarget,
 } from "vscode";
-import { DistributionManager } from "./distribution";
+import { DistributionManager } from "./codeql-cli/distribution";
 import { extLogger } from "./common";
 import { ONE_DAY_IN_MS } from "./pure/time";
 

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

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

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

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

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

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

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

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

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

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