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

extensions/ql-vscode/src/codeql-cli/cli.ts

@@ -16,7 +16,7 @@ import { allowCanaryQueryServer, CliConfig } from "../config";
 import {
   DistributionProvider,
   FindDistributionResultKind,
-} from "../distribution";
+} from "./distribution";
 import {
   assertNever,
   getErrorMessage,

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";
-import { getCodeQlCliVersion } from "./codeql-cli/cli-version";
-import { ProgressCallback, reportStreamProgress } from "./progress";
+} from "../helpers";
+import { extLogger } from "../common";
+import { getCodeQlCliVersion } from "./cli-version";
+import { ProgressCallback, reportStreamProgress } from "../progress";
 import {
   codeQlLauncherName,
   deprecatedCodeQlLauncherName,
   extractZipArchive,
   getRequiredAssetName,
-} from "./pure/distribution";
+} from "../pure/distribution";
 
 /**
  * distribution.ts

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/extension.ts

@@ -54,7 +54,7 @@ import {
   FindDistributionResultKind,
   GithubApiError,
   GithubRateLimitedError,
-} from "./distribution";
+} from "./codeql-cli/distribution";
 import {
   showAndLogErrorMessage,
   showAndLogExceptionWithTelemetry,

extensions/ql-vscode/test/vscode-tests/no-workspace/codeql-cli/distribution.test.ts

@@ -1,8 +1,8 @@
 import * as fetch from "node-fetch";
 import { Range } from "semver";
 
-import * as helpers from "../../../src/helpers";
-import { extLogger } from "../../../src/common";
+import * as helpers from "../../../../src/helpers";
+import { extLogger } from "../../../../src/common";
 import * as fs from "fs-extra";
 import * as path from "path";
 import * as os from "os";
@@ -13,7 +13,7 @@ import {
   ReleasesApiConsumer,
   getExecutableFromDirectory,
   DistributionManager,
-} from "../../../src/distribution";
+} from "../../../../src/codeql-cli/distribution";
 import { DirectoryResult } from "tmp-promise";
 
 jest.mock("os", () => {