Fix remaining imports

extensions/ql-vscode/src/ast-cfg-commands.ts

@@ -1,5 +1,5 @@
 import { Uri, window } from "vscode";
-import { withProgress } from "./commandRunner";
+import { withProgress } from "./progress";
 import { AstViewer } from "./astViewer";
 import {
   TemplatePrintAstProvider,

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

@@ -1,8 +1,4 @@
-import {
-  ProgressCallback,
-  ProgressUpdate,
-  withProgress,
-} from "./commandRunner";
+import { ProgressCallback, ProgressUpdate, withProgress } from "./progress";
 import {
   CancellationToken,
   CancellationTokenSource,

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

@@ -25,7 +25,7 @@ import {
 } from "../../../../src/variant-analysis/shared/variant-analysis";
 import { VariantAnalysis as VariantAnalysisApiResponse } from "../../../../src/variant-analysis/gh-api/variant-analysis";
 import { createMockApiResponse } from "../../../factories/variant-analysis/gh-api/variant-analysis-api-response";
-import { UserCancellationException } from "../../../../src/commandRunner";
+import { UserCancellationException } from "../../../../src/progress";
 import { Repository } from "../../../../src/variant-analysis/gh-api/repository";
 import { DbManager } from "../../../../src/databases/db-manager";
 import { ExtensionApp } from "../../../../src/common/vscode/vscode-app";

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

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

extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts

@@ -38,7 +38,7 @@ import {
   showInformationMessageWithAction,
   walkDirectory,
 } from "../../../src/helpers";
-import { reportStreamProgress } from "../../../src/commandRunner";
+import { reportStreamProgress } from "../../../src/progress";
 import { QueryLanguage } from "../../../src/common/query-language";
 import { Setting } from "../../../src/config";
 

extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts

@@ -9,7 +9,7 @@ import {
   TelemetryListener,
   telemetryListener as globalTelemetryListener,
 } from "../../../src/telemetry";
-import { UserCancellationException } from "../../../src/commandRunner";
+import { UserCancellationException } from "../../../src/progress";
 import { ENABLE_TELEMETRY } from "../../../src/config";
 import { createMockExtensionContext } from "./index";
 import { vscodeGetConfigurationMock } from "../test-config";