Move vscode utils to /common/vscode

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,

extensions/ql-vscode/src/abstract-webview.ts → 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;

extensions/ql-vscode/src/archive-filesystem-provider.ts → 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.

extensions/ql-vscode/src/authentication.ts → 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";
 

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,

extensions/ql-vscode/src/vscode-utils/external-files.ts → 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,

extensions/ql-vscode/src/vscode-utils/multi-file-system-watcher.ts → 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";
 
 /**

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

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

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

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

@@ -7,12 +7,15 @@ import {
   workspace,
   WorkspaceFolder,
 } from "vscode";
-import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview";
+import {
+  AbstractWebview,
+  WebviewPanelConfig,
+} from "../common/vscode/abstract-webview";
 import {
   FromDataExtensionsEditorMessage,
   ToDataExtensionsEditorMessage,
 } from "../pure/interface-types";
-import { ProgressUpdate } from "../progress";
+import { ProgressUpdate } from "../common/vscode/progress";
 import { QueryRunner } from "../query-server";
 import {
   showAndLogErrorMessage,

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

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

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,

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 {

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,

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

@@ -13,13 +13,13 @@ import {
   showBinaryChoiceDialog,
   getFirstWorkspaceFolder,
 } from "../helpers";
-import { ProgressCallback, withProgress } from "../progress";
+import { ProgressCallback, withProgress } from "../common/vscode/progress";
 import {
   zipArchiveScheme,
   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";

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,

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

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

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

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

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

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

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

@@ -14,11 +14,11 @@ 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";
-import { ProgressCallback, withProgress } from "../../progress";
+import { ProgressCallback, withProgress } from "../../common/vscode/progress";
 import { KeyType } from "./key-type";
 import {
   FullLocationLink,

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,

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

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

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

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,

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 {

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

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

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

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,

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