Merge pull request #2388 from github/charisk/move-common-vscode-files

Move vscode utils to /common/vscode

Author: charisk

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,

…nsions/ql-vscode/src/abstract-webview.ts …de/src/common/vscode/abstract-webview.tsextensions/ql-vscode/src/abstract-webview.ts renamed to extensions/ql-vscode/src/common/vscode/abstract-webview.ts extensions/ql-vscode/src/abstract-webview.ts renamed to 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;

…scode/src/archive-filesystem-provider.ts …on/vscode/archive-filesystem-provider.tsextensions/ql-vscode/src/archive-filesystem-provider.ts renamed to extensions/ql-vscode/src/common/vscode/archive-filesystem-provider.ts extensions/ql-vscode/src/archive-filesystem-provider.ts renamed to 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.

…tensions/ql-vscode/src/authentication.ts …code/src/common/vscode/authentication.tsextensions/ql-vscode/src/authentication.ts renamed to extensions/ql-vscode/src/common/vscode/authentication.ts extensions/ql-vscode/src/authentication.ts renamed to 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,

…scode/src/vscode-utils/external-files.ts …code/src/common/vscode/external-files.tsextensions/ql-vscode/src/vscode-utils/external-files.ts renamed to extensions/ql-vscode/src/common/vscode/external-files.ts extensions/ql-vscode/src/vscode-utils/external-files.ts renamed to 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,

…scode-utils/multi-file-system-watcher.ts …mmon/vscode/multi-file-system-watcher.tsextensions/ql-vscode/src/vscode-utils/multi-file-system-watcher.ts renamed to extensions/ql-vscode/src/common/vscode/multi-file-system-watcher.ts extensions/ql-vscode/src/vscode-utils/multi-file-system-watcher.ts renamed to 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/progress.ts …/ql-vscode/src/common/vscode/progress.tsextensions/ql-vscode/src/progress.ts renamed to extensions/ql-vscode/src/common/vscode/progress.ts extensions/ql-vscode/src/progress.ts renamed to extensions/ql-vscode/src/common/vscode/progress.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/common/vscode/vscode-app.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";