From 5c6e8a46a379b58f262e79abf2e294e29896a9b9 Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Fri, 28 Apr 2023 07:41:50 +0000 Subject: [PATCH 1/6] Move vscode-uitls/external-files.ts to /common/vscode/external-files.ts --- .../vscode}/external-files.ts | 12 ++++++++---- .../src/query-history/query-history-manager.ts | 2 +- .../vscode}/external-files.test.ts | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) rename extensions/ql-vscode/src/{vscode-utils => common/vscode}/external-files.ts (86%) rename extensions/ql-vscode/test/vscode-tests/no-workspace/{query-history/vscode-utils => common/vscode}/external-files.test.ts (96%) diff --git a/extensions/ql-vscode/src/vscode-utils/external-files.ts b/extensions/ql-vscode/src/common/vscode/external-files.ts similarity index 86% rename from extensions/ql-vscode/src/vscode-utils/external-files.ts rename to extensions/ql-vscode/src/common/vscode/external-files.ts index b355199ef..bf0d17164 100644 --- a/extensions/ql-vscode/src/vscode-utils/external-files.ts +++ b/extensions/ql-vscode/src/common/vscode/external-files.ts @@ -1,11 +1,15 @@ import { Uri, window } from "vscode"; -import { AppCommandManager } from "../common/commands"; +import { AppCommandManager } from "../commands"; import { showAndLogExceptionWithTelemetry, showBinaryChoiceDialog, -} from "../helpers"; -import { redactableError } from "../pure/errors"; -import { asError, getErrorMessage, getErrorStack } from "../pure/helpers-pure"; +} from "../../helpers"; +import { redactableError } from "../../pure/errors"; +import { + asError, + getErrorMessage, + getErrorStack, +} from "../../pure/helpers-pure"; export async function tryOpenExternalFile( commandManager: AppCommandManager, diff --git a/extensions/ql-vscode/src/query-history/query-history-manager.ts b/extensions/ql-vscode/src/query-history/query-history-manager.ts index a636f9958..ac24cd0bf 100644 --- a/extensions/ql-vscode/src/query-history/query-history-manager.ts +++ b/extensions/ql-vscode/src/query-history/query-history-manager.ts @@ -55,7 +55,7 @@ import { HistoryTreeDataProvider } from "./history-tree-data-provider"; import { QueryHistoryDirs } from "./query-history-dirs"; import { QueryHistoryCommands } from "../common/commands"; import { App } from "../common/app"; -import { tryOpenExternalFile } from "../vscode-utils/external-files"; +import { tryOpenExternalFile } from "../common/vscode/external-files"; import { createMultiSelectionCommand, createSingleSelectionCommand, diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/vscode-utils/external-files.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/external-files.test.ts similarity index 96% rename from extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/vscode-utils/external-files.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/external-files.test.ts index b87ee3fe6..64f0af045 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/vscode-utils/external-files.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/external-files.test.ts @@ -1,5 +1,5 @@ import * as vscode from "vscode"; -import { tryOpenExternalFile } from "../../../../../src/vscode-utils/external-files"; +import { tryOpenExternalFile } from "../../../../../src/common/vscode/external-files"; import { createMockCommandManager } from "../../../../__mocks__/commandsMock"; import { mockedObject } from "../../../utils/mocking.helpers"; From ff473101331d3b78f273df52baf39623ab7112e9 Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Fri, 28 Apr 2023 07:43:32 +0000 Subject: [PATCH 2/6] Move vscode-uitls/multi-file-system-watcher.ts to /common/vscode/multi-file-system-watcher.ts --- .../vscode}/multi-file-system-watcher.ts | 2 +- extensions/ql-vscode/src/qltest-discovery.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename extensions/ql-vscode/src/{vscode-utils => common/vscode}/multi-file-system-watcher.ts (96%) diff --git a/extensions/ql-vscode/src/vscode-utils/multi-file-system-watcher.ts b/extensions/ql-vscode/src/common/vscode/multi-file-system-watcher.ts similarity index 96% rename from extensions/ql-vscode/src/vscode-utils/multi-file-system-watcher.ts rename to extensions/ql-vscode/src/common/vscode/multi-file-system-watcher.ts index 29f363e25..39c3a31f0 100644 --- a/extensions/ql-vscode/src/vscode-utils/multi-file-system-watcher.ts +++ b/extensions/ql-vscode/src/common/vscode/multi-file-system-watcher.ts @@ -1,4 +1,4 @@ -import { DisposableObject } from "../pure/disposable-object"; +import { DisposableObject } from "../../pure/disposable-object"; import { EventEmitter, Event, Uri, GlobPattern, workspace } from "vscode"; /** diff --git a/extensions/ql-vscode/src/qltest-discovery.ts b/extensions/ql-vscode/src/qltest-discovery.ts index df6d5c9bb..73032c2b6 100644 --- a/extensions/ql-vscode/src/qltest-discovery.ts +++ b/extensions/ql-vscode/src/qltest-discovery.ts @@ -8,7 +8,7 @@ import { WorkspaceFolder, env, } from "vscode"; -import { MultiFileSystemWatcher } from "./vscode-utils/multi-file-system-watcher"; +import { MultiFileSystemWatcher } from "./common/vscode/multi-file-system-watcher"; import { CodeQLCliServer } from "./codeql-cli/cli"; import { pathExists } from "fs-extra"; From d1db456e2eae73f9dcb1f21f02e11dbc6f9325a0 Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Fri, 28 Apr 2023 07:44:51 +0000 Subject: [PATCH 3/6] Move abstract-webview.ts to /common/vscode/abstract-webview.ts --- .../ql-vscode/src/{ => common/vscode}/abstract-webview.ts | 6 +++--- extensions/ql-vscode/src/compare/compare-view.ts | 5 ++++- .../data-extensions-editor/data-extensions-editor-view.ts | 5 ++++- extensions/ql-vscode/src/interface.ts | 5 ++++- .../ql-vscode/src/variant-analysis/data-flow-paths-view.ts | 5 ++++- .../ql-vscode/src/variant-analysis/variant-analysis-view.ts | 5 ++++- 6 files changed, 23 insertions(+), 8 deletions(-) rename extensions/ql-vscode/src/{ => common/vscode}/abstract-webview.ts (96%) diff --git a/extensions/ql-vscode/src/abstract-webview.ts b/extensions/ql-vscode/src/common/vscode/abstract-webview.ts similarity index 96% rename from extensions/ql-vscode/src/abstract-webview.ts rename to extensions/ql-vscode/src/common/vscode/abstract-webview.ts index dd50a03f5..50e5385f2 100644 --- a/extensions/ql-vscode/src/abstract-webview.ts +++ b/extensions/ql-vscode/src/common/vscode/abstract-webview.ts @@ -9,13 +9,13 @@ import { } from "vscode"; import { join } from "path"; -import { DisposableObject, DisposeHandler } from "./pure/disposable-object"; -import { tmpDir } from "./helpers"; +import { DisposableObject, DisposeHandler } from "../../pure/disposable-object"; +import { tmpDir } from "../../helpers"; import { getHtmlForWebview, WebviewMessage, WebviewView, -} from "./interface-utils"; +} from "../../interface-utils"; export type WebviewPanelConfig = { viewId: string; diff --git a/extensions/ql-vscode/src/compare/compare-view.ts b/extensions/ql-vscode/src/compare/compare-view.ts index 0c03c4a72..df684d19e 100644 --- a/extensions/ql-vscode/src/compare/compare-view.ts +++ b/extensions/ql-vscode/src/compare/compare-view.ts @@ -18,7 +18,10 @@ import resultsDiff from "./resultsDiff"; import { CompletedLocalQueryInfo } from "../query-results"; import { assertNever, getErrorMessage } from "../pure/helpers-pure"; import { HistoryItemLabelProvider } from "../query-history/history-item-label-provider"; -import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview"; +import { + AbstractWebview, + WebviewPanelConfig, +} from "../common/vscode/abstract-webview"; import { telemetryListener } from "../telemetry"; import { redactableError } from "../pure/errors"; import { showAndLogExceptionWithTelemetry } from "../helpers"; diff --git a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts index 6678fb4d8..d2746cc45 100644 --- a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts +++ b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts @@ -7,7 +7,10 @@ import { workspace, WorkspaceFolder, } from "vscode"; -import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview"; +import { + AbstractWebview, + WebviewPanelConfig, +} from "../common/vscode/abstract-webview"; import { FromDataExtensionsEditorMessage, ToDataExtensionsEditorMessage, diff --git a/extensions/ql-vscode/src/interface.ts b/extensions/ql-vscode/src/interface.ts index 314c59f37..7f82c0a9c 100644 --- a/extensions/ql-vscode/src/interface.ts +++ b/extensions/ql-vscode/src/interface.ts @@ -66,7 +66,10 @@ import { transformBqrsResultSet, ResultSetSchema, } from "./pure/bqrs-cli-types"; -import { AbstractWebview, WebviewPanelConfig } from "./abstract-webview"; +import { + AbstractWebview, + WebviewPanelConfig, +} from "./common/vscode/abstract-webview"; import { isCanary, PAGE_SIZE } from "./config"; import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider"; import { telemetryListener } from "./telemetry"; diff --git a/extensions/ql-vscode/src/variant-analysis/data-flow-paths-view.ts b/extensions/ql-vscode/src/variant-analysis/data-flow-paths-view.ts index cfaf568db..1c80920f8 100644 --- a/extensions/ql-vscode/src/variant-analysis/data-flow-paths-view.ts +++ b/extensions/ql-vscode/src/variant-analysis/data-flow-paths-view.ts @@ -1,5 +1,8 @@ import { ExtensionContext, ViewColumn } from "vscode"; -import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview"; +import { + AbstractWebview, + WebviewPanelConfig, +} from "../common/vscode/abstract-webview"; import { assertNever } from "../pure/helpers-pure"; import { telemetryListener } from "../telemetry"; import { diff --git a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts index 6f2a81838..495228e17 100644 --- a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts +++ b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts @@ -1,5 +1,8 @@ import { ExtensionContext, ViewColumn } from "vscode"; -import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview"; +import { + AbstractWebview, + WebviewPanelConfig, +} from "../common/vscode/abstract-webview"; import { extLogger } from "../common"; import { FromVariantAnalysisMessage, From 8500f20c2b5ccf0a76270c1dd9c43240974d6a32 Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Fri, 28 Apr 2023 07:47:17 +0000 Subject: [PATCH 4/6] Move archive-filesystem-provider.ts to /common/vscode/archive-filesystem-provider.ts --- .../vscode}/archive-filesystem-provider.ts | 2 +- .../ql-vscode/src/databases/local-databases.ts | 2 +- extensions/ql-vscode/src/extension.ts | 2 +- .../contextual/location-finder.ts | 2 +- .../contextual/template-provider.ts | 2 +- .../minimal-workspace/local-databases.test.ts | 2 +- .../archive-filesystem-provider.test.ts | 18 +++++++++--------- 7 files changed, 15 insertions(+), 15 deletions(-) rename extensions/ql-vscode/src/{ => common/vscode}/archive-filesystem-provider.ts (99%) rename extensions/ql-vscode/test/vscode-tests/no-workspace/{ => common/vscode}/archive-filesystem-provider.test.ts (89%) diff --git a/extensions/ql-vscode/src/archive-filesystem-provider.ts b/extensions/ql-vscode/src/common/vscode/archive-filesystem-provider.ts similarity index 99% rename from extensions/ql-vscode/src/archive-filesystem-provider.ts rename to extensions/ql-vscode/src/common/vscode/archive-filesystem-provider.ts index 10bf09d22..6c6cca84e 100644 --- a/extensions/ql-vscode/src/archive-filesystem-provider.ts +++ b/extensions/ql-vscode/src/common/vscode/archive-filesystem-provider.ts @@ -1,7 +1,7 @@ import { pathExists } from "fs-extra"; import * as unzipper from "unzipper"; import * as vscode from "vscode"; -import { extLogger } from "./common"; +import { extLogger } from ".."; // All path operations in this file must be on paths *within* the zip // archive. diff --git a/extensions/ql-vscode/src/databases/local-databases.ts b/extensions/ql-vscode/src/databases/local-databases.ts index 375817969..09d0c51ea 100644 --- a/extensions/ql-vscode/src/databases/local-databases.ts +++ b/extensions/ql-vscode/src/databases/local-databases.ts @@ -19,7 +19,7 @@ import { encodeArchiveBasePath, decodeSourceArchiveUri, encodeSourceArchiveUri, -} from "../archive-filesystem-provider"; +} from "../common/vscode/archive-filesystem-provider"; import { DisposableObject } from "../pure/disposable-object"; import { Logger, extLogger } from "../common"; import { asError, getErrorMessage } from "../pure/helpers-pure"; diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index 2bd37009c..52963ed3e 100644 --- a/extensions/ql-vscode/src/extension.ts +++ b/extensions/ql-vscode/src/extension.ts @@ -23,7 +23,7 @@ import { watch } from "chokidar"; import { activate as archiveFilesystemProvider_activate, zipArchiveScheme, -} from "./archive-filesystem-provider"; +} from "./common/vscode/archive-filesystem-provider"; import { CodeQLCliServer } from "./codeql-cli/cli"; import { CliConfigListener, diff --git a/extensions/ql-vscode/src/language-support/contextual/location-finder.ts b/extensions/ql-vscode/src/language-support/contextual/location-finder.ts index 02b294db2..6f22d39d9 100644 --- a/extensions/ql-vscode/src/language-support/contextual/location-finder.ts +++ b/extensions/ql-vscode/src/language-support/contextual/location-finder.ts @@ -1,7 +1,7 @@ import { decodeSourceArchiveUri, encodeArchiveBasePath, -} from "../../archive-filesystem-provider"; +} from "../../common/vscode/archive-filesystem-provider"; import { ColumnKindCode, EntityValue, diff --git a/extensions/ql-vscode/src/language-support/contextual/template-provider.ts b/extensions/ql-vscode/src/language-support/contextual/template-provider.ts index dc7ea86ca..55560a14b 100644 --- a/extensions/ql-vscode/src/language-support/contextual/template-provider.ts +++ b/extensions/ql-vscode/src/language-support/contextual/template-provider.ts @@ -14,7 +14,7 @@ import { decodeSourceArchiveUri, encodeArchiveBasePath, zipArchiveScheme, -} from "../../archive-filesystem-provider"; +} from "../../common/vscode/archive-filesystem-provider"; import { CodeQLCliServer } from "../../codeql-cli/cli"; import { DatabaseManager } from "../../databases/local-databases"; import { CachedOperation } from "../../helpers"; diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts index 4bafa39a9..945f7852e 100644 --- a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts @@ -18,7 +18,7 @@ import { CodeQLCliServer, DbInfo } from "../../../src/codeql-cli/cli"; import { encodeArchiveBasePath, encodeSourceArchiveUri, -} from "../../../src/archive-filesystem-provider"; +} from "../../../src/common/vscode/archive-filesystem-provider"; import { testDisposeHandler } from "../test-dispose-handler"; import { QueryRunner } from "../../../src/query-server/query-runner"; import * as helpers from "../../../src/helpers"; diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/archive-filesystem-provider.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/archive-filesystem-provider.test.ts similarity index 89% rename from extensions/ql-vscode/test/vscode-tests/no-workspace/archive-filesystem-provider.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/archive-filesystem-provider.test.ts index 7ca3c6ef0..b03a10e2f 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/archive-filesystem-provider.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/archive-filesystem-provider.test.ts @@ -7,7 +7,7 @@ import { decodeSourceArchiveUri, ZipFileReference, zipArchiveScheme, -} from "../../../src/archive-filesystem-provider"; +} from "../../../../../src/common/vscode/archive-filesystem-provider"; import { FileType, FileSystemError, Uri } from "vscode"; describe("archive-filesystem-provider", () => { @@ -16,7 +16,7 @@ describe("archive-filesystem-provider", () => { const uri = encodeSourceArchiveUri({ sourceArchiveZipPath: resolve( __dirname, - "data/archive-filesystem-provider-test/single_file.zip", + "../../data/archive-filesystem-provider-test/single_file.zip", ), pathWithinSourceArchive: "/aFileName.txt", }); @@ -29,7 +29,7 @@ describe("archive-filesystem-provider", () => { const uri = encodeSourceArchiveUri({ sourceArchiveZipPath: resolve( __dirname, - "data/archive-filesystem-provider-test/zip_with_folder.zip", + "../../data/archive-filesystem-provider-test/zip_with_folder.zip", ), pathWithinSourceArchive: "folder1/textFile.txt", }); @@ -42,7 +42,7 @@ describe("archive-filesystem-provider", () => { const uri = encodeSourceArchiveUri({ sourceArchiveZipPath: resolve( __dirname, - "data/archive-filesystem-provider-test/zip_with_folder.zip", + "../../data/archive-filesystem-provider-test/zip_with_folder.zip", ), pathWithinSourceArchive: "folder1", }); @@ -59,7 +59,7 @@ describe("archive-filesystem-provider", () => { const uri = encodeSourceArchiveUri({ sourceArchiveZipPath: resolve( __dirname, - "data/archive-filesystem-provider-test/zip_with_folder.zip", + "../../data/archive-filesystem-provider-test/zip_with_folder.zip", ), pathWithinSourceArchive: "folder1/not-here", }); @@ -76,7 +76,7 @@ describe("archive-filesystem-provider", () => { const uri = encodeSourceArchiveUri({ sourceArchiveZipPath: resolve( __dirname, - "data/archive-filesystem-provider-test/zip_with_folder.zip", + "../../data/archive-filesystem-provider-test/zip_with_folder.zip", ), pathWithinSourceArchive: "folder1/not-here", }); @@ -93,7 +93,7 @@ describe("archive-filesystem-provider", () => { const uri = encodeSourceArchiveUri({ sourceArchiveZipPath: resolve( __dirname, - "data/archive-filesystem-provider-test/zip_with_folder.zip", + "../../data/archive-filesystem-provider-test/zip_with_folder.zip", ), pathWithinSourceArchive: "folder1/textFile.txt", }); @@ -110,7 +110,7 @@ describe("archive-filesystem-provider", () => { const uri = encodeSourceArchiveUri({ sourceArchiveZipPath: resolve( __dirname, - "data/archive-filesystem-provider-test/zip_with_folder.zip", + "../../data/archive-filesystem-provider-test/zip_with_folder.zip", ), pathWithinSourceArchive: "folder1/folder2", }); @@ -127,7 +127,7 @@ describe("archive-filesystem-provider", () => { const uri = encodeSourceArchiveUri({ sourceArchiveZipPath: resolve( __dirname, - "data/archive-filesystem-provider-test/zip_with_folder.zip", + "../../data/archive-filesystem-provider-test/zip_with_folder.zip", ), pathWithinSourceArchive: "folder1/folder2", }); From 4f1315aeaeb72048d79581a5ea892c8e98e40c23 Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Fri, 28 Apr 2023 07:49:48 +0000 Subject: [PATCH 5/6] Move authentication.ts to /common/vscode/authentication.ts --- extensions/ql-vscode/src/{ => common/vscode}/authentication.ts | 2 +- extensions/ql-vscode/src/common/vscode/vscode-app.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename extensions/ql-vscode/src/{ => common/vscode}/authentication.ts (96%) diff --git a/extensions/ql-vscode/src/authentication.ts b/extensions/ql-vscode/src/common/vscode/authentication.ts similarity index 96% rename from extensions/ql-vscode/src/authentication.ts rename to extensions/ql-vscode/src/common/vscode/authentication.ts index 8fc055458..625a31d36 100644 --- a/extensions/ql-vscode/src/authentication.ts +++ b/extensions/ql-vscode/src/common/vscode/authentication.ts @@ -1,7 +1,7 @@ import * as vscode from "vscode"; import * as Octokit from "@octokit/rest"; import { retry } from "@octokit/plugin-retry"; -import { Credentials } from "./common/authentication"; +import { Credentials } from "../authentication"; const GITHUB_AUTH_PROVIDER_ID = "github"; diff --git a/extensions/ql-vscode/src/common/vscode/vscode-app.ts b/extensions/ql-vscode/src/common/vscode/vscode-app.ts index a8f9da973..986d74c9a 100644 --- a/extensions/ql-vscode/src/common/vscode/vscode-app.ts +++ b/extensions/ql-vscode/src/common/vscode/vscode-app.ts @@ -1,5 +1,5 @@ import * as vscode from "vscode"; -import { VSCodeCredentials } from "../../authentication"; +import { VSCodeCredentials } from "./authentication"; import { Disposable } from "../../pure/disposable-object"; import { App, AppMode } from "../app"; import { AppEventEmitter } from "../events"; From b034c31db8cfcfbc87ec47b0d2f79e241c3f281b Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Fri, 28 Apr 2023 07:51:34 +0000 Subject: [PATCH 6/6] Move progress.ts to /common/vscode/progress.ts --- extensions/ql-vscode/src/codeql-cli/distribution.ts | 5 ++++- extensions/ql-vscode/src/common/vscode/commands.ts | 2 +- extensions/ql-vscode/src/{ => common/vscode}/progress.ts | 0 .../data-extensions-editor/data-extensions-editor-module.ts | 2 +- .../data-extensions-editor/data-extensions-editor-view.ts | 2 +- .../src/data-extensions-editor/extension-pack-picker.ts | 2 +- .../src/data-extensions-editor/external-api-usage-query.ts | 2 +- .../src/data-extensions-editor/generate-flow-model.ts | 2 +- extensions/ql-vscode/src/databases/database-fetcher.ts | 5 ++++- extensions/ql-vscode/src/databases/local-databases-ui.ts | 2 +- extensions/ql-vscode/src/databases/local-databases.ts | 2 +- extensions/ql-vscode/src/databases/ui/db-panel.ts | 2 +- extensions/ql-vscode/src/extension.ts | 2 +- extensions/ql-vscode/src/helpers.ts | 2 +- .../src/language-support/ast-viewer/ast-cfg-commands.ts | 2 +- .../src/language-support/contextual/location-finder.ts | 2 +- .../src/language-support/contextual/query-resolver.ts | 2 +- .../src/language-support/contextual/template-provider.ts | 2 +- extensions/ql-vscode/src/local-queries/local-queries.ts | 6 +++++- extensions/ql-vscode/src/local-queries/quick-query.ts | 5 ++++- extensions/ql-vscode/src/packaging/packaging.ts | 2 +- .../src/query-server/legacy/legacy-query-runner.ts | 2 +- .../src/query-server/legacy/query-server-client.ts | 2 +- extensions/ql-vscode/src/query-server/legacy/run-queries.ts | 2 +- extensions/ql-vscode/src/query-server/legacy/upgrades.ts | 5 ++++- extensions/ql-vscode/src/query-server/new-query-runner.ts | 5 ++++- extensions/ql-vscode/src/query-server/query-runner.ts | 2 +- .../ql-vscode/src/query-server/query-server-client.ts | 2 +- extensions/ql-vscode/src/query-server/run-queries.ts | 2 +- extensions/ql-vscode/src/run-queries-shared.ts | 2 +- extensions/ql-vscode/src/skeleton-query-wizard.ts | 5 ++++- extensions/ql-vscode/src/telemetry.ts | 2 +- extensions/ql-vscode/src/variant-analysis/export-results.ts | 2 +- .../ql-vscode/src/variant-analysis/repository-selection.ts | 2 +- .../ql-vscode/src/variant-analysis/run-remote-query.ts | 5 ++++- .../src/variant-analysis/variant-analysis-manager.ts | 2 +- .../test/vscode-tests/cli-integration/queries.test.ts | 2 +- .../variant-analysis/variant-analysis-manager.test.ts | 2 +- extensions/ql-vscode/test/vscode-tests/global.helper.ts | 2 +- .../vscode-tests/minimal-workspace/local-databases.test.ts | 2 +- .../test/vscode-tests/no-workspace/helpers.test.ts | 2 +- .../test/vscode-tests/no-workspace/telemetry.test.ts | 2 +- 42 files changed, 66 insertions(+), 41 deletions(-) rename extensions/ql-vscode/src/{ => common/vscode}/progress.ts (100%) diff --git a/extensions/ql-vscode/src/codeql-cli/distribution.ts b/extensions/ql-vscode/src/codeql-cli/distribution.ts index 41f2f627b..60ccfdf1a 100644 --- a/extensions/ql-vscode/src/codeql-cli/distribution.ts +++ b/extensions/ql-vscode/src/codeql-cli/distribution.ts @@ -14,7 +14,10 @@ import { } from "../helpers"; import { extLogger } from "../common"; import { getCodeQlCliVersion } from "./cli-version"; -import { ProgressCallback, reportStreamProgress } from "../progress"; +import { + ProgressCallback, + reportStreamProgress, +} from "../common/vscode/progress"; import { codeQlLauncherName, deprecatedCodeQlLauncherName, diff --git a/extensions/ql-vscode/src/common/vscode/commands.ts b/extensions/ql-vscode/src/common/vscode/commands.ts index 3d71ae004..dfd765e17 100644 --- a/extensions/ql-vscode/src/common/vscode/commands.ts +++ b/extensions/ql-vscode/src/common/vscode/commands.ts @@ -7,7 +7,7 @@ import { getErrorStack, } from "../../pure/helpers-pure"; import { redactableError } from "../../pure/errors"; -import { UserCancellationException } from "../../progress"; +import { UserCancellationException } from "./progress"; import { showAndLogExceptionWithTelemetry, showAndLogWarningMessage, diff --git a/extensions/ql-vscode/src/progress.ts b/extensions/ql-vscode/src/common/vscode/progress.ts similarity index 100% rename from extensions/ql-vscode/src/progress.ts rename to extensions/ql-vscode/src/common/vscode/progress.ts diff --git a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts index 7ca19acc3..745b47451 100644 --- a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts +++ b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts @@ -8,7 +8,7 @@ import { ensureDir } from "fs-extra"; import { join } from "path"; import { App } from "../common/app"; import { showAndLogErrorMessage } from "../helpers"; -import { withProgress } from "../progress"; +import { withProgress } from "../common/vscode/progress"; import { pickExtensionPackModelFile } from "./extension-pack-picker"; const SUPPORTED_LANGUAGES: string[] = ["java", "csharp"]; diff --git a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts index d2746cc45..c60983129 100644 --- a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts +++ b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts @@ -15,7 +15,7 @@ import { FromDataExtensionsEditorMessage, ToDataExtensionsEditorMessage, } from "../pure/interface-types"; -import { ProgressUpdate } from "../progress"; +import { ProgressUpdate } from "../common/vscode/progress"; import { QueryRunner } from "../query-server"; import { showAndLogErrorMessage, diff --git a/extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts b/extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts index 1869ee31d..d8c2430fb 100644 --- a/extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts +++ b/extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts @@ -9,7 +9,7 @@ import { getOnDiskWorkspaceFoldersObjects, showAndLogErrorMessage, } from "../helpers"; -import { ProgressCallback } from "../progress"; +import { ProgressCallback } from "../common/vscode/progress"; import { DatabaseItem } from "../databases/local-databases"; import { getQlPackPath, QLPACK_FILENAMES } from "../pure/ql"; import { getErrorMessage } from "../pure/helpers-pure"; diff --git a/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts b/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts index cce355d5b..9fbc7b293 100644 --- a/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts +++ b/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts @@ -10,7 +10,7 @@ import { TeeLogger } from "../common"; import { CancellationToken } from "vscode"; import { CodeQLCliServer } from "../codeql-cli/cli"; import { DatabaseItem } from "../databases/local-databases"; -import { ProgressCallback } from "../progress"; +import { ProgressCallback } from "../common/vscode/progress"; import { fetchExternalApiQueries } from "./queries"; import { QueryResultType } from "../pure/new-messages"; import { join } from "path"; diff --git a/extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts b/extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts index 4ad1f1b79..6f48d8587 100644 --- a/extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts +++ b/extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts @@ -5,7 +5,7 @@ import { QueryRunner } from "../query-server"; import { CodeQLCliServer } from "../codeql-cli/cli"; import { TeeLogger } from "../common"; import { extensiblePredicateDefinitions } from "./predicates"; -import { ProgressCallback } from "../progress"; +import { ProgressCallback } from "../common/vscode/progress"; import { getOnDiskWorkspaceFolders, showAndLogExceptionWithTelemetry, diff --git a/extensions/ql-vscode/src/databases/database-fetcher.ts b/extensions/ql-vscode/src/databases/database-fetcher.ts index 5deeb816b..e4e73f7b3 100644 --- a/extensions/ql-vscode/src/databases/database-fetcher.ts +++ b/extensions/ql-vscode/src/databases/database-fetcher.ts @@ -18,7 +18,10 @@ import { retry } from "@octokit/plugin-retry"; import { DatabaseManager, DatabaseItem } from "./local-databases"; import { showAndLogInformationMessage, tmpDir } from "../helpers"; -import { reportStreamProgress, ProgressCallback } from "../progress"; +import { + reportStreamProgress, + ProgressCallback, +} from "../common/vscode/progress"; import { extLogger } from "../common"; import { getErrorMessage } from "../pure/helpers-pure"; import { diff --git a/extensions/ql-vscode/src/databases/local-databases-ui.ts b/extensions/ql-vscode/src/databases/local-databases-ui.ts index f2068d64c..0839b2afc 100644 --- a/extensions/ql-vscode/src/databases/local-databases-ui.ts +++ b/extensions/ql-vscode/src/databases/local-databases-ui.ts @@ -27,7 +27,7 @@ import { ProgressContext, withInheritedProgress, withProgress, -} from "../progress"; +} from "../common/vscode/progress"; import { isLikelyDatabaseRoot, isLikelyDbLanguageFolder, diff --git a/extensions/ql-vscode/src/databases/local-databases.ts b/extensions/ql-vscode/src/databases/local-databases.ts index 09d0c51ea..bc34733a9 100644 --- a/extensions/ql-vscode/src/databases/local-databases.ts +++ b/extensions/ql-vscode/src/databases/local-databases.ts @@ -13,7 +13,7 @@ import { showBinaryChoiceDialog, getFirstWorkspaceFolder, } from "../helpers"; -import { ProgressCallback, withProgress } from "../progress"; +import { ProgressCallback, withProgress } from "../common/vscode/progress"; import { zipArchiveScheme, encodeArchiveBasePath, diff --git a/extensions/ql-vscode/src/databases/ui/db-panel.ts b/extensions/ql-vscode/src/databases/ui/db-panel.ts index 7ea333681..16abf9f50 100644 --- a/extensions/ql-vscode/src/databases/ui/db-panel.ts +++ b/extensions/ql-vscode/src/databases/ui/db-panel.ts @@ -6,7 +6,7 @@ import { window, workspace, } from "vscode"; -import { UserCancellationException } from "../../progress"; +import { UserCancellationException } from "../../common/vscode/progress"; import { getNwoFromGitHubUrl, isValidGitHubNwo, diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index 52963ed3e..e0f5fde9e 100644 --- a/extensions/ql-vscode/src/extension.ts +++ b/extensions/ql-vscode/src/extension.ts @@ -90,7 +90,7 @@ import { QLTestAdapterFactory } from "./test-adapter"; import { TestUIService } from "./test-ui"; import { CompareView } from "./compare/compare-view"; import { initializeTelemetry } from "./telemetry"; -import { ProgressCallback, withProgress } from "./progress"; +import { ProgressCallback, withProgress } from "./common/vscode/progress"; import { CodeQlStatusBarHandler } from "./status-bar"; import { getPackagingCommands } from "./packaging"; import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider"; diff --git a/extensions/ql-vscode/src/helpers.ts b/extensions/ql-vscode/src/helpers.ts index 6331695d5..1b66a7b3d 100644 --- a/extensions/ql-vscode/src/helpers.ts +++ b/extensions/ql-vscode/src/helpers.ts @@ -19,7 +19,7 @@ import { WorkspaceFolder, } from "vscode"; import { CodeQLCliServer, QlpacksInfo } from "./codeql-cli/cli"; -import { UserCancellationException } from "./progress"; +import { UserCancellationException } from "./common/vscode/progress"; import { extLogger, OutputChannelLogger } from "./common"; import { QueryMetadata } from "./pure/interface-types"; import { telemetryListener } from "./telemetry"; diff --git a/extensions/ql-vscode/src/language-support/ast-viewer/ast-cfg-commands.ts b/extensions/ql-vscode/src/language-support/ast-viewer/ast-cfg-commands.ts index 9d0c07734..1e0067c25 100644 --- a/extensions/ql-vscode/src/language-support/ast-viewer/ast-cfg-commands.ts +++ b/extensions/ql-vscode/src/language-support/ast-viewer/ast-cfg-commands.ts @@ -1,5 +1,5 @@ import { Uri, window } from "vscode"; -import { withProgress } from "../../progress"; +import { withProgress } from "../../common/vscode/progress"; import { AstViewer } from "./ast-viewer"; import { AstCfgCommands } from "../../common/commands"; import { LocalQueries } from "../../local-queries"; diff --git a/extensions/ql-vscode/src/language-support/contextual/location-finder.ts b/extensions/ql-vscode/src/language-support/contextual/location-finder.ts index 6f22d39d9..ef998a10a 100644 --- a/extensions/ql-vscode/src/language-support/contextual/location-finder.ts +++ b/extensions/ql-vscode/src/language-support/contextual/location-finder.ts @@ -10,7 +10,7 @@ import { } from "../../pure/bqrs-cli-types"; import { CodeQLCliServer } from "../../codeql-cli/cli"; import { DatabaseManager, DatabaseItem } from "../../databases/local-databases"; -import { ProgressCallback } from "../../progress"; +import { ProgressCallback } from "../../common/vscode/progress"; import { KeyType } from "./key-type"; import { qlpackOfDatabase, diff --git a/extensions/ql-vscode/src/language-support/contextual/query-resolver.ts b/extensions/ql-vscode/src/language-support/contextual/query-resolver.ts index ad9b1a887..7cb3f398b 100644 --- a/extensions/ql-vscode/src/language-support/contextual/query-resolver.ts +++ b/extensions/ql-vscode/src/language-support/contextual/query-resolver.ts @@ -20,7 +20,7 @@ import { CodeQLCliServer } from "../../codeql-cli/cli"; import { DatabaseItem } from "../../databases/local-databases"; import { extLogger, TeeLogger } from "../../common"; import { CancellationToken } from "vscode"; -import { ProgressCallback } from "../../progress"; +import { ProgressCallback } from "../../common/vscode/progress"; import { CoreCompletedQuery, QueryRunner } from "../../query-server"; import { redactableError } from "../../pure/errors"; import { QLPACK_FILENAMES } from "../../pure/ql"; diff --git a/extensions/ql-vscode/src/language-support/contextual/template-provider.ts b/extensions/ql-vscode/src/language-support/contextual/template-provider.ts index 55560a14b..f459e2e7d 100644 --- a/extensions/ql-vscode/src/language-support/contextual/template-provider.ts +++ b/extensions/ql-vscode/src/language-support/contextual/template-provider.ts @@ -18,7 +18,7 @@ import { import { CodeQLCliServer } from "../../codeql-cli/cli"; import { DatabaseManager } from "../../databases/local-databases"; import { CachedOperation } from "../../helpers"; -import { ProgressCallback, withProgress } from "../../progress"; +import { ProgressCallback, withProgress } from "../../common/vscode/progress"; import { KeyType } from "./key-type"; import { FullLocationLink, diff --git a/extensions/ql-vscode/src/local-queries/local-queries.ts b/extensions/ql-vscode/src/local-queries/local-queries.ts index a53f9599a..e92036802 100644 --- a/extensions/ql-vscode/src/local-queries/local-queries.ts +++ b/extensions/ql-vscode/src/local-queries/local-queries.ts @@ -1,4 +1,8 @@ -import { ProgressCallback, ProgressUpdate, withProgress } from "../progress"; +import { + ProgressCallback, + ProgressUpdate, + withProgress, +} from "../common/vscode/progress"; import { CancellationToken, CancellationTokenSource, diff --git a/extensions/ql-vscode/src/local-queries/quick-query.ts b/extensions/ql-vscode/src/local-queries/quick-query.ts index 0dfdd5573..cdf392330 100644 --- a/extensions/ql-vscode/src/local-queries/quick-query.ts +++ b/extensions/ql-vscode/src/local-queries/quick-query.ts @@ -11,7 +11,10 @@ import { getQlPackForDbscheme, showBinaryChoiceDialog, } from "../helpers"; -import { ProgressCallback, UserCancellationException } from "../progress"; +import { + ProgressCallback, + UserCancellationException, +} from "../common/vscode/progress"; import { getErrorMessage } from "../pure/helpers-pure"; import { FALLBACK_QLPACK_FILENAME, getQlPackPath } from "../pure/ql"; import { App } from "../common/app"; diff --git a/extensions/ql-vscode/src/packaging/packaging.ts b/extensions/ql-vscode/src/packaging/packaging.ts index 63d6ac00a..91f350b56 100644 --- a/extensions/ql-vscode/src/packaging/packaging.ts +++ b/extensions/ql-vscode/src/packaging/packaging.ts @@ -9,7 +9,7 @@ import { ProgressCallback, UserCancellationException, withProgress, -} from "../progress"; +} from "../common/vscode/progress"; import { extLogger } from "../common"; import { asError, getErrorStack } from "../pure/helpers-pure"; import { redactableError } from "../pure/errors"; diff --git a/extensions/ql-vscode/src/query-server/legacy/legacy-query-runner.ts b/extensions/ql-vscode/src/query-server/legacy/legacy-query-runner.ts index 8c4d7924c..0e0759506 100644 --- a/extensions/ql-vscode/src/query-server/legacy/legacy-query-runner.ts +++ b/extensions/ql-vscode/src/query-server/legacy/legacy-query-runner.ts @@ -1,6 +1,6 @@ import { CancellationToken } from "vscode"; import { CodeQLCliServer } from "../../codeql-cli/cli"; -import { ProgressCallback } from "../../progress"; +import { ProgressCallback } from "../../common/vscode/progress"; import { Logger } from "../../common"; import { DatabaseItem } from "../../databases/local-databases"; import { diff --git a/extensions/ql-vscode/src/query-server/legacy/query-server-client.ts b/extensions/ql-vscode/src/query-server/legacy/query-server-client.ts index 12e0ac327..2983ddde4 100644 --- a/extensions/ql-vscode/src/query-server/legacy/query-server-client.ts +++ b/extensions/ql-vscode/src/query-server/legacy/query-server-client.ts @@ -13,7 +13,7 @@ import { ProgressMessage, WithProgressId, } from "../../pure/legacy-messages"; -import { ProgressCallback, ProgressTask } from "../../progress"; +import { ProgressCallback, ProgressTask } from "../../common/vscode/progress"; import { ServerProcess } from "../server-process"; import { App } from "../../common/app"; diff --git a/extensions/ql-vscode/src/query-server/legacy/run-queries.ts b/extensions/ql-vscode/src/query-server/legacy/run-queries.ts index 3a761bdb7..485338d69 100644 --- a/extensions/ql-vscode/src/query-server/legacy/run-queries.ts +++ b/extensions/ql-vscode/src/query-server/legacy/run-queries.ts @@ -14,7 +14,7 @@ import { showAndLogWarningMessage, upgradesTmpDir, } from "../../helpers"; -import { ProgressCallback } from "../../progress"; +import { ProgressCallback } from "../../common/vscode/progress"; import { QueryMetadata } from "../../pure/interface-types"; import { extLogger, Logger } from "../../common"; import * as messages from "../../pure/legacy-messages"; diff --git a/extensions/ql-vscode/src/query-server/legacy/upgrades.ts b/extensions/ql-vscode/src/query-server/legacy/upgrades.ts index 93ec09582..24b19ba8a 100644 --- a/extensions/ql-vscode/src/query-server/legacy/upgrades.ts +++ b/extensions/ql-vscode/src/query-server/legacy/upgrades.ts @@ -4,7 +4,10 @@ import { showAndLogExceptionWithTelemetry, tmpDir, } from "../../helpers"; -import { ProgressCallback, UserCancellationException } from "../../progress"; +import { + ProgressCallback, + UserCancellationException, +} from "../../common/vscode/progress"; import { extLogger } from "../../common"; import * as messages from "../../pure/legacy-messages"; import * as qsClient from "./query-server-client"; diff --git a/extensions/ql-vscode/src/query-server/new-query-runner.ts b/extensions/ql-vscode/src/query-server/new-query-runner.ts index 1693dc064..88ff4e3e8 100644 --- a/extensions/ql-vscode/src/query-server/new-query-runner.ts +++ b/extensions/ql-vscode/src/query-server/new-query-runner.ts @@ -1,5 +1,8 @@ import { CancellationToken } from "vscode"; -import { ProgressCallback, UserCancellationException } from "../progress"; +import { + ProgressCallback, + UserCancellationException, +} from "../common/vscode/progress"; import { DatabaseItem } from "../databases/local-databases"; import { clearCache, diff --git a/extensions/ql-vscode/src/query-server/query-runner.ts b/extensions/ql-vscode/src/query-server/query-runner.ts index 8ca6bc4e5..95d7eafef 100644 --- a/extensions/ql-vscode/src/query-server/query-runner.ts +++ b/extensions/ql-vscode/src/query-server/query-runner.ts @@ -1,6 +1,6 @@ import { CancellationToken } from "vscode"; import { CodeQLCliServer } from "../codeql-cli/cli"; -import { ProgressCallback } from "../progress"; +import { ProgressCallback } from "../common/vscode/progress"; import { DatabaseItem } from "../databases/local-databases"; import { QueryOutputDir } from "../run-queries-shared"; import { Position, QueryResultType } from "../pure/new-messages"; diff --git a/extensions/ql-vscode/src/query-server/query-server-client.ts b/extensions/ql-vscode/src/query-server/query-server-client.ts index d9cbdd697..752100cfd 100644 --- a/extensions/ql-vscode/src/query-server/query-server-client.ts +++ b/extensions/ql-vscode/src/query-server/query-server-client.ts @@ -11,7 +11,7 @@ import { ProgressMessage, WithProgressId, } from "../pure/new-messages"; -import { ProgressCallback, ProgressTask } from "../progress"; +import { ProgressCallback, ProgressTask } from "../common/vscode/progress"; import { ServerProcess } from "./server-process"; import { App } from "../common/app"; diff --git a/extensions/ql-vscode/src/query-server/run-queries.ts b/extensions/ql-vscode/src/query-server/run-queries.ts index db09d64db..9f9e441c6 100644 --- a/extensions/ql-vscode/src/query-server/run-queries.ts +++ b/extensions/ql-vscode/src/query-server/run-queries.ts @@ -1,5 +1,5 @@ import { CancellationToken } from "vscode"; -import { ProgressCallback } from "../progress"; +import { ProgressCallback } from "../common/vscode/progress"; import * as messages from "../pure/new-messages"; import { QueryOutputDir } from "../run-queries-shared"; import * as qsClient from "./query-server-client"; diff --git a/extensions/ql-vscode/src/run-queries-shared.ts b/extensions/ql-vscode/src/run-queries-shared.ts index fcae6855f..cdb472a0b 100644 --- a/extensions/ql-vscode/src/run-queries-shared.ts +++ b/extensions/ql-vscode/src/run-queries-shared.ts @@ -12,7 +12,7 @@ import { window, } from "vscode"; import { isCanary, AUTOSAVE_SETTING } from "./config"; -import { UserCancellationException } from "./progress"; +import { UserCancellationException } from "./common/vscode/progress"; import { pathExists, readFile, diff --git a/extensions/ql-vscode/src/skeleton-query-wizard.ts b/extensions/ql-vscode/src/skeleton-query-wizard.ts index 403e6b427..46e4bc826 100644 --- a/extensions/ql-vscode/src/skeleton-query-wizard.ts +++ b/extensions/ql-vscode/src/skeleton-query-wizard.ts @@ -12,7 +12,10 @@ import { import { getErrorMessage } from "./pure/helpers-pure"; import { QlPackGenerator } from "./qlpack-generator"; import { DatabaseItem, DatabaseManager } from "./databases/local-databases"; -import { ProgressCallback, UserCancellationException } from "./progress"; +import { + ProgressCallback, + UserCancellationException, +} from "./common/vscode/progress"; import { askForGitHubRepo, downloadGitHubDatabase, diff --git a/extensions/ql-vscode/src/telemetry.ts b/extensions/ql-vscode/src/telemetry.ts index fe3bc52cb..597b5e740 100644 --- a/extensions/ql-vscode/src/telemetry.ts +++ b/extensions/ql-vscode/src/telemetry.ts @@ -16,7 +16,7 @@ import { } from "./config"; import * as appInsights from "applicationinsights"; import { extLogger } from "./common"; -import { UserCancellationException } from "./progress"; +import { UserCancellationException } from "./common/vscode/progress"; import { showBinaryChoiceWithUrlDialog } from "./helpers"; import { RedactableError } from "./pure/errors"; import { SemVer } from "semver"; diff --git a/extensions/ql-vscode/src/variant-analysis/export-results.ts b/extensions/ql-vscode/src/variant-analysis/export-results.ts index bab80c731..167ccac88 100644 --- a/extensions/ql-vscode/src/variant-analysis/export-results.ts +++ b/extensions/ql-vscode/src/variant-analysis/export-results.ts @@ -6,7 +6,7 @@ import { ProgressCallback, UserCancellationException, withProgress, -} from "../progress"; +} from "../common/vscode/progress"; import { showInformationMessageWithAction } from "../helpers"; import { extLogger } from "../common"; import { createGist } from "./gh-api/gh-api-client"; diff --git a/extensions/ql-vscode/src/variant-analysis/repository-selection.ts b/extensions/ql-vscode/src/variant-analysis/repository-selection.ts index b8ddcdb51..4ad149cd5 100644 --- a/extensions/ql-vscode/src/variant-analysis/repository-selection.ts +++ b/extensions/ql-vscode/src/variant-analysis/repository-selection.ts @@ -1,4 +1,4 @@ -import { UserCancellationException } from "../progress"; +import { UserCancellationException } from "../common/vscode/progress"; import { DbManager } from "../databases/db-manager"; import { DbItemKind } from "../databases/db-item"; diff --git a/extensions/ql-vscode/src/variant-analysis/run-remote-query.ts b/extensions/ql-vscode/src/variant-analysis/run-remote-query.ts index f880599b7..aa6285cfe 100644 --- a/extensions/ql-vscode/src/variant-analysis/run-remote-query.ts +++ b/extensions/ql-vscode/src/variant-analysis/run-remote-query.ts @@ -18,7 +18,10 @@ import { getRemoteControllerRepo, setRemoteControllerRepo, } from "../config"; -import { ProgressCallback, UserCancellationException } from "../progress"; +import { + ProgressCallback, + UserCancellationException, +} from "../common/vscode/progress"; import { RequestError } from "@octokit/types/dist-types"; import { QueryMetadata } from "../pure/interface-types"; import { getErrorMessage, REPO_REGEX } from "../pure/helpers-pure"; diff --git a/extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts index dc8cacfe7..f639d5b7d 100644 --- a/extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts +++ b/extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts @@ -54,7 +54,7 @@ import { ProgressCallback, UserCancellationException, withProgress, -} from "../progress"; +} from "../common/vscode/progress"; import { CodeQLCliServer } from "../codeql-cli/cli"; import { defaultFilterSortState, diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts index 0bcdafede..491e6d037 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts @@ -36,7 +36,7 @@ import { AppCommandManager, QueryServerCommands, } from "../../../src/common/commands"; -import { ProgressCallback } from "../../../src/progress"; +import { ProgressCallback } from "../../../src/common/vscode/progress"; import { withDebugController } from "./debugger/debug-controller"; type DebugMode = "localQueries" | "debug"; diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts index 36beba059..8d8bc9aed 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts @@ -22,7 +22,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/progress"; +import { UserCancellationException } from "../../../../src/common/vscode/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"; diff --git a/extensions/ql-vscode/test/vscode-tests/global.helper.ts b/extensions/ql-vscode/test/vscode-tests/global.helper.ts index b73756f84..61251f0a1 100644 --- a/extensions/ql-vscode/test/vscode-tests/global.helper.ts +++ b/extensions/ql-vscode/test/vscode-tests/global.helper.ts @@ -14,7 +14,7 @@ import { 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"; +import { ProgressCallback } from "../../src/common/vscode/progress"; import { importArchiveDatabase } from "../../src/databases/database-fetcher"; import { createMockCommandManager } from "../__mocks__/commandsMock"; diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts index 945f7852e..0b7679d54 100644 --- a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts @@ -13,7 +13,7 @@ import { FullDatabaseOptions, } from "../../../src/databases/local-databases"; import { Logger } from "../../../src/common"; -import { ProgressCallback } from "../../../src/progress"; +import { ProgressCallback } from "../../../src/common/vscode/progress"; import { CodeQLCliServer, DbInfo } from "../../../src/codeql-cli/cli"; import { encodeArchiveBasePath, diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts index 8aed77f16..01a084b2f 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts +++ b/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/progress"; +import { reportStreamProgress } from "../../../src/common/vscode/progress"; import { QueryLanguage } from "../../../src/common/query-language"; import { Setting } from "../../../src/config"; import { createMockCommandManager } from "../../__mocks__/commandsMock"; diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts index a52267caf..f0637b6f0 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts +++ b/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/progress"; +import { UserCancellationException } from "../../../src/common/vscode/progress"; import { ENABLE_TELEMETRY } from "../../../src/config"; import { createMockExtensionContext } from "./index"; import { vscodeGetConfigurationMock } from "../test-config";