Merge pull request #2530 from github/robertbrignull/move-pure-1

Move files from /pure to the /common directory (part 1 of 3)

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

@@ -1,7 +1,7 @@
 import * as semver from "semver";
 import { runCodeQlCliCommand } from "./cli";
 import { Logger } from "../common/logging";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "../common/helpers-pure";
 
 /**
  * Get the version of a CodeQL CLI.

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

@@ -11,7 +11,7 @@ import tk from "tree-kill";
 import { promisify } from "util";
 import { CancellationToken, Disposable, Uri } from "vscode";
 
-import { BQRSInfo, DecodedBqrsChunk } from "../pure/bqrs-cli-types";
+import { BQRSInfo, DecodedBqrsChunk } from "../common/bqrs-cli-types";
 import { allowCanaryQueryServer, CliConfig } from "../config";
 import {
   DistributionProvider,
@@ -21,8 +21,8 @@ import {
   assertNever,
   getErrorMessage,
   getErrorStack,
-} from "../pure/helpers-pure";
-import { walkDirectory } from "../pure/files";
+} from "../common/helpers-pure";
+import { walkDirectory } from "../common/files";
 import { QueryMetadata, SortDirection } from "../pure/interface-types";
 import { BaseLogger, Logger } from "../common/logging";
 import { ProgressReporter } from "../common/logging/vscode";

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

@@ -17,7 +17,7 @@ import {
   deprecatedCodeQlLauncherName,
   extractZipArchive,
   getRequiredAssetName,
-} from "../pure/distribution";
+} from "../common/distribution";
 import {
   InvocationRateLimiter,
   InvocationRateLimiterResultKind,

extensions/ql-vscode/src/common/app.ts

@@ -1,5 +1,5 @@
 import { Credentials } from "./authentication";
-import { Disposable } from "../pure/disposable-object";
+import { Disposable } from "./disposable-object";
 import { AppEventEmitter } from "./events";
 import { NotificationLogger } from "./logging";
 import { Memento } from "./memento";

extensions/ql-vscode/src/common/bqrs-utils.ts

@@ -4,7 +4,7 @@ import {
   LineColumnLocation,
   WholeFileLocation,
 } from "./bqrs-cli-types";
-import { createRemoteFileRef } from "./location-link-utils";
+import { createRemoteFileRef } from "../pure/location-link-utils";
 
 /**
  * The CodeQL filesystem libraries use this pattern in `getURL()` predicates

extensions/ql-vscode/src/common/discovery.ts

@@ -1,5 +1,5 @@
-import { DisposableObject } from "../pure/disposable-object";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { DisposableObject } from "./disposable-object";
+import { getErrorMessage } from "./helpers-pure";
 import { Logger } from "./logging";
 
 /**

extensions/ql-vscode/src/common/events.ts

@@ -1,4 +1,4 @@
-import { Disposable } from "../pure/disposable-object";
+import { Disposable } from "./disposable-object";
 
 export interface AppEvent<T> {
   (listener: (event: T) => void): Disposable;

extensions/ql-vscode/src/common/github-url-identifier-helper.ts

@@ -1,4 +1,4 @@
-import { OWNER_REGEX, REPO_REGEX } from "../pure/helpers-pure";
+import { OWNER_REGEX, REPO_REGEX } from "./helpers-pure";
 
 /**
  * Checks if a string is a valid GitHub NWO.

extensions/ql-vscode/src/common/logging/notifications.ts

@@ -1,6 +1,6 @@
 import { NotificationLogger } from "./notification-logger";
 import { AppTelemetry } from "../telemetry";
-import { RedactableError } from "../../pure/errors";
+import { RedactableError } from "../errors";
 
 export interface ShowAndLogOptions {
   /**

extensions/ql-vscode/src/common/logging/tee-logger.ts

@@ -1,6 +1,6 @@
 import { appendFile, ensureFile } from "fs-extra";
 import { isAbsolute } from "path";
-import { getErrorMessage } from "../../pure/helpers-pure";
+import { getErrorMessage } from "../helpers-pure";
 import { Logger, LogOptions } from "./logger";
 
 /**

extensions/ql-vscode/src/common/logging/vscode/output-channel-logger.ts

@@ -1,6 +1,6 @@
 import { window as Window, OutputChannel, Progress } from "vscode";
 import { Logger, LogOptions } from "../logger";
-import { DisposableObject } from "../../../pure/disposable-object";
+import { DisposableObject } from "../../disposable-object";
 import { NotificationLogger } from "../notification-logger";
 
 /**

extensions/ql-vscode/src/common/sarif-parser.ts

@@ -1,7 +1,7 @@
 import * as Sarif from "sarif";
 import { createReadStream } from "fs-extra";
 import { connectTo } from "stream-json/Assembler";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "./helpers-pure";
 import { withParser } from "stream-json/filters/Pick";
 
 const DUMMY_TOOL: Sarif.Tool = { driver: { name: "" } };

extensions/ql-vscode/src/common/telemetry.ts

@@ -1,4 +1,4 @@
-import { RedactableError } from "../pure/errors";
+import { RedactableError } from "./errors";
 
 export interface AppTelemetry {
   sendCommandUsage(name: string, executionTime: number, error?: Error): void;

extensions/ql-vscode/src/common/vscode/abstract-webview.ts

@@ -9,7 +9,7 @@ import {
 } from "vscode";
 import { join } from "path";
 
-import { DisposableObject, DisposeHandler } from "../../pure/disposable-object";
+import { DisposableObject, DisposeHandler } from "../disposable-object";
 import { tmpDir } from "../../tmp-dir";
 import { getHtmlForWebview, WebviewMessage, WebviewView } from "./webview-html";
 

extensions/ql-vscode/src/common/vscode/commands.ts

@@ -10,8 +10,8 @@ import {
   asError,
   getErrorMessage,
   getErrorStack,
-} from "../../pure/helpers-pure";
-import { redactableError } from "../../pure/errors";
+} from "../../common/helpers-pure";
+import { redactableError } from "../../common/errors";
 import { UserCancellationException } from "./progress";
 import { telemetryListener } from "./telemetry";
 import { AppTelemetry } from "../telemetry";

extensions/ql-vscode/src/common/vscode/external-files.ts

@@ -1,12 +1,12 @@
 import { Uri, window } from "vscode";
 import { AppCommandManager } from "../commands";
 import { showBinaryChoiceDialog } from "./dialog";
-import { redactableError } from "../../pure/errors";
+import { redactableError } from "../../common/errors";
 import {
   asError,
   getErrorMessage,
   getErrorStack,
-} from "../../pure/helpers-pure";
+} from "../../common/helpers-pure";
 import { showAndLogExceptionWithTelemetry } from "../logging";
 import { extLogger } from "../logging/vscode";
 import { telemetryListener } from "./telemetry";

extensions/ql-vscode/src/common/vscode/file-path-discovery.ts

@@ -11,12 +11,12 @@ import { MultiFileSystemWatcher } from "./multi-file-system-watcher";
 import { AppEventEmitter } from "../events";
 import { extLogger } from "../logging/vscode";
 import { lstat } from "fs-extra";
-import { containsPath, isIOError } from "../../pure/files";
+import { containsPath, isIOError } from "../files";
 import {
   getOnDiskWorkspaceFolders,
   getOnDiskWorkspaceFoldersObjects,
 } from "./workspace-folders";
-import { getErrorMessage } from "../../pure/helpers-pure";
+import { getErrorMessage } from "../../common/helpers-pure";
 
 interface PathData {
   path: string;

extensions/ql-vscode/src/common/vscode/multi-file-system-watcher.ts

@@ -1,4 +1,4 @@
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../disposable-object";
 import { EventEmitter, Event, Uri, GlobPattern, workspace } from "vscode";
 
 /**

extensions/ql-vscode/src/common/vscode/telemetry.ts

@@ -18,7 +18,7 @@ import * as appInsights from "applicationinsights";
 import { extLogger } from "../logging/vscode";
 import { UserCancellationException } from "./progress";
 import { showBinaryChoiceWithUrlDialog } from "./dialog";
-import { RedactableError } from "../../pure/errors";
+import { RedactableError } from "../errors";
 import { SemVer } from "semver";
 import { AppTelemetry } from "../telemetry";
 

extensions/ql-vscode/src/common/vscode/vscode-app.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 import { VSCodeCredentials } from "./authentication";
-import { Disposable } from "../../pure/disposable-object";
+import { Disposable } from "../disposable-object";
 import { App, AppMode, EnvironmentContext } from "../app";
 import { AppEventEmitter } from "../events";
 import { NotificationLogger } from "../logging";

extensions/ql-vscode/src/compare/compare-view.ts

@@ -14,17 +14,17 @@ import {
   transformBqrsResultSet,
   RawResultSet,
   BQRSInfo,
-} from "../pure/bqrs-cli-types";
+} from "../common/bqrs-cli-types";
 import resultsDiff from "./resultsDiff";
 import { CompletedLocalQueryInfo } from "../query-results";
-import { assertNever, getErrorMessage } from "../pure/helpers-pure";
+import { assertNever, getErrorMessage } from "../common/helpers-pure";
 import { HistoryItemLabelProvider } from "../query-history/history-item-label-provider";
 import {
   AbstractWebview,
   WebviewPanelConfig,
 } from "../common/vscode/abstract-webview";
 import { telemetryListener } from "../common/vscode/telemetry";
-import { redactableError } from "../pure/errors";
+import { redactableError } from "../common/errors";
 
 interface ComparePair {
   from: CompletedLocalQueryInfo;

extensions/ql-vscode/src/compare/resultsDiff.ts

@@ -1,4 +1,4 @@
-import { RawResultSet } from "../pure/bqrs-cli-types";
+import { RawResultSet } from "../common/bqrs-cli-types";
 import { QueryCompareResult } from "../pure/interface-types";
 
 /**

extensions/ql-vscode/src/config.ts

@@ -1,4 +1,4 @@
-import { DisposableObject } from "./pure/disposable-object";
+import { DisposableObject } from "./common/disposable-object";
 import {
   workspace,
   Event,

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

@@ -1,4 +1,4 @@
-import { DecodedBqrsChunk } from "../pure/bqrs-cli-types";
+import { DecodedBqrsChunk } from "../common/bqrs-cli-types";
 import { Call, ExternalApiUsage } from "./external-api-usage";
 
 export function decodeBqrsToExternalApiUsages(

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

@@ -25,14 +25,14 @@ import { outputFile, pathExists, readFile } from "fs-extra";
 import { load as loadYaml } from "js-yaml";
 import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
 import { CodeQLCliServer } from "../codeql-cli/cli";
-import { asError, assertNever, getErrorMessage } from "../pure/helpers-pure";
+import { asError, assertNever, getErrorMessage } from "../common/helpers-pure";
 import { generateFlowModel } from "./generate-flow-model";
 import { promptImportGithubDatabase } from "../databases/database-fetcher";
 import { App } from "../common/app";
-import { ResolvableLocationValue } from "../pure/bqrs-cli-types";
+import { ResolvableLocationValue } from "../common/bqrs-cli-types";
 import { showResolvableLocation } from "../databases/local-databases/locations";
 import { decodeBqrsToExternalApiUsages } from "./bqrs";
-import { redactableError } from "../pure/errors";
+import { redactableError } from "../common/errors";
 import { readQueryResults, runQuery } from "./external-api-usage-query";
 import { createDataExtensionYaml, loadDataExtensionYaml } from "./yaml";
 import { ExternalApiUsage } from "./external-api-usage";

extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts

@@ -11,10 +11,10 @@ import {
 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";
+import { getErrorMessage } from "../common/helpers-pure";
 import { ExtensionPack, ExtensionPackModelFile } from "./shared/extension-pack";
 import { NotificationLogger, showAndLogErrorMessage } from "../common/logging";
-import { containsPath } from "../pure/files";
+import { containsPath } from "../common/files";
 
 const maxStep = 3;
 

extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts

@@ -13,7 +13,7 @@ import { ProgressCallback } from "../common/vscode/progress";
 import { fetchExternalApiQueries } from "./queries";
 import { QueryResultType } from "../pure/new-messages";
 import { join } from "path";
-import { redactableError } from "../pure/errors";
+import { redactableError } from "../common/errors";
 import { telemetryListener } from "../common/vscode/telemetry";
 
 export type RunQueryOptions = {

extensions/ql-vscode/src/data-extensions-editor/external-api-usage.ts

@@ -1,4 +1,4 @@
-import { ResolvableLocationValue } from "../pure/bqrs-cli-types";
+import { ResolvableLocationValue } from "../common/bqrs-cli-types";
 
 export type Call = {
   label: string;

extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts

@@ -12,7 +12,7 @@ import {
   ModeledMethodType,
   ModeledMethodWithSignature,
 } from "./modeled-method";
-import { redactableError } from "../pure/errors";
+import { redactableError } from "../common/errors";
 import { QueryResultType } from "../pure/new-messages";
 import { file } from "tmp-promise";
 import { writeFile } from "fs-extra";

extensions/ql-vscode/src/databases/config/db-config-store.ts

@@ -18,7 +18,10 @@ import {
   SelectedDbItemKind,
 } from "./db-config";
 import * as chokidar from "chokidar";
-import { DisposableObject, DisposeHandler } from "../../pure/disposable-object";
+import {
+  DisposableObject,
+  DisposeHandler,
+} from "../../common/disposable-object";
 import { DbConfigValidator } from "./db-config-validator";
 import { App } from "../../common/app";
 import { AppEvent, AppEventEmitter } from "../../common/events";

extensions/ql-vscode/src/databases/database-fetcher.ts

@@ -23,7 +23,7 @@ import {
   ProgressCallback,
 } from "../common/vscode/progress";
 import { extLogger } from "../common/logging/vscode";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "../common/helpers-pure";
 import {
   getNwoFromGitHubUrl,
   isValidGitHubNwo,

extensions/ql-vscode/src/databases/db-manager.ts

@@ -1,7 +1,7 @@
 import { App } from "../common/app";
 import { AppEvent, AppEventEmitter } from "../common/events";
 import { ValueResult } from "../common/value-result";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { DbConfigStore } from "./config/db-config-store";
 import {
   DbItem,

extensions/ql-vscode/src/databases/db-module.ts

@@ -1,7 +1,7 @@
 import { window } from "vscode";
 import { App } from "../common/app";
 import { extLogger } from "../common/logging/vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { DbConfigStore } from "./config/db-config-store";
 import { DbManager } from "./db-manager";
 import { DbPanel } from "./ui/db-panel";

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

@@ -1,5 +1,5 @@
 import { join, basename, dirname as path_dirname } from "path";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import {
   Event,
   EventEmitter,
@@ -41,11 +41,11 @@ import {
   promptImportGithubDatabase,
   promptImportInternetDatabase,
 } from "./database-fetcher";
-import { asError, asyncFilter, getErrorMessage } from "../pure/helpers-pure";
+import { asError, asyncFilter, getErrorMessage } from "../common/helpers-pure";
 import { QueryRunner } from "../query-server";
 import { isCanary } from "../config";
 import { App } from "../common/app";
-import { redactableError } from "../pure/errors";
+import { redactableError } from "../common/errors";
 import { LocalDatabasesCommands } from "../common/commands";
 import {
   createMultiSelectionCommand,

extensions/ql-vscode/src/databases/local-databases/database-item-impl.ts

@@ -12,7 +12,7 @@ import {
 import { DatabaseItem, PersistedDatabaseItem } from "./database-item";
 import { isLikelyDatabaseRoot } from "./db-contents-heuristics";
 import { stat } from "fs-extra";
-import { containsPath, pathsEqual } from "../../pure/files";
+import { containsPath, pathsEqual } from "../../common/files";
 import { DatabaseContents } from "./database-contents";
 
 export class DatabaseItemImpl implements DatabaseItem {

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

@@ -1,7 +1,7 @@
 import vscode, { ExtensionContext } from "vscode";
 import { Logger, showAndLogExceptionWithTelemetry } from "../../common/logging";
 import { extLogger } from "../../common/logging/vscode";
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../../common/disposable-object";
 import { App } from "../../common/app";
 import { QueryRunner } from "../../query-server";
 import * as cli from "../../codeql-cli/cli";
@@ -22,11 +22,11 @@ import {
 import { isQueryLanguage } from "../../common/query-language";
 import { existsSync } from "fs";
 import { QlPackGenerator } from "../../qlpack-generator";
-import { asError, getErrorMessage } from "../../pure/helpers-pure";
+import { asError, getErrorMessage } from "../../common/helpers-pure";
 import { DatabaseItem, PersistedDatabaseItem } from "./database-item";
-import { redactableError } from "../../pure/errors";
+import { redactableError } from "../../common/errors";
 import { remove } from "fs-extra";
-import { containsPath } from "../../pure/files";
+import { containsPath } from "../../common/files";
 import { DatabaseChangedEvent, DatabaseEventKind } from "./database-events";
 import { DatabaseResolver } from "./database-resolver";
 import { telemetryListener } from "../../common/vscode/telemetry";

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

@@ -14,12 +14,12 @@ import {
   ResolvableLocationValue,
   UrlValue,
   WholeFileLocation,
-} from "../../pure/bqrs-cli-types";
+} from "../../common/bqrs-cli-types";
 import {
   isLineColumnLoc,
   tryGetResolvableLocation,
-} from "../../pure/bqrs-utils";
-import { getErrorMessage } from "../../pure/helpers-pure";
+} from "../../common/bqrs-utils";
+import { getErrorMessage } from "../../common/helpers-pure";
 import { Logger } from "../../common/logging";
 import { DatabaseItem } from "./database-item";
 import { DatabaseManager } from "./database-manager";

extensions/ql-vscode/src/databases/ui/db-panel.ts

@@ -14,7 +14,7 @@ import {
   getOwnerFromGitHubUrl,
   isValidGitHubOwner,
 } from "../../common/github-url-identifier-helper";
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../../common/disposable-object";
 import {
   DbItem,
   DbItemKind,
@@ -29,7 +29,7 @@ import { DbTreeDataProvider } from "./db-tree-data-provider";
 import { DbTreeViewItem } from "./db-tree-view-item";
 import { getGitHubUrl } from "./db-tree-view-item-action";
 import { getControllerRepo } from "../../variant-analysis/run-remote-query";
-import { getErrorMessage } from "../../pure/helpers-pure";
+import { getErrorMessage } from "../../common/helpers-pure";
 import { DatabasePanelCommands } from "../../common/commands";
 import { App } from "../../common/app";
 import { QueryLanguage } from "../../common/query-language";

extensions/ql-vscode/src/databases/ui/db-tree-data-provider.ts

@@ -8,7 +8,7 @@ import {
 import { createDbTreeViewItemError, DbTreeViewItem } from "./db-tree-view-item";
 import { DbManager } from "../db-manager";
 import { mapDbItemToTreeViewItem } from "./db-item-mapper";
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../../common/disposable-object";
 import {
   DbConfigValidationError,
   DbConfigValidationErrorKind,

extensions/ql-vscode/src/debugger/debug-configuration.ts

@@ -8,7 +8,7 @@ import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
 import { LocalQueries } from "../local-queries";
 import { getQuickEvalContext, validateQueryPath } from "../run-queries-shared";
 import * as CodeQLProtocol from "./debug-protocol";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "../common/helpers-pure";
 import { showAndLogErrorMessage } from "../common/logging";
 import { extLogger } from "../common/logging/vscode";
 

extensions/ql-vscode/src/debugger/debug-session.ts

@@ -18,8 +18,8 @@ import { QueryResultType } from "../pure/new-messages";
 import { CoreQueryResults, CoreQueryRun, QueryRunner } from "../query-server";
 import * as CodeQLProtocol from "./debug-protocol";
 import { QuickEvalContext } from "../run-queries-shared";
-import { getErrorMessage } from "../pure/helpers-pure";
-import { DisposableObject } from "../pure/disposable-object";
+import { getErrorMessage } from "../common/helpers-pure";
+import { DisposableObject } from "../common/disposable-object";
 
 // More complete implementations of `Event` for certain events, because the classes from
 // `@vscode/debugadapter` make it more difficult to provide some of the message values.

extensions/ql-vscode/src/debugger/debugger-factory.ts

@@ -10,7 +10,7 @@ import {
 } from "vscode";
 import { isCanary } from "../config";
 import { LocalQueries } from "../local-queries";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QueryRunner } from "../query-server";
 import { QLDebugConfigurationProvider } from "./debug-configuration";
 import { QLDebugSession } from "./debug-session";

extensions/ql-vscode/src/debugger/debugger-ui.ts

@@ -9,7 +9,7 @@ import {
 } from "vscode";
 import { DebuggerCommands } from "../common/commands";
 import { DatabaseManager } from "../databases/local-databases";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { CoreQueryResults } from "../query-server";
 import {
   getQuickEvalContext,

extensions/ql-vscode/src/extension.ts

@@ -66,7 +66,7 @@ import {
   assertNever,
   getErrorMessage,
   getErrorStack,
-} from "./pure/helpers-pure";
+} from "./common/helpers-pure";
 import {
   ResultsView,
   WebviewReveal,
@@ -115,7 +115,7 @@ import { VSCodeMockGitHubApiServer } from "./variant-analysis/gh-api/mocks/vscod
 import { VariantAnalysisResultsManager } from "./variant-analysis/variant-analysis-results-manager";
 import { ExtensionApp } from "./common/vscode/vscode-app";
 import { DbModule } from "./databases/db-module";
-import { redactableError } from "./pure/errors";
+import { redactableError } from "./common/errors";
 import { QLDebugAdapterDescriptorFactory } from "./debugger/debugger-factory";
 import { QueryHistoryDirs } from "./query-history/query-history-dirs";
 import {

extensions/ql-vscode/src/language-support/ast-viewer/ast-builder.ts

@@ -3,7 +3,7 @@ import {
   DecodedBqrsChunk,
   BqrsId,
   EntityValue,
-} from "../../pure/bqrs-cli-types";
+} from "../../common/bqrs-cli-types";
 import { DatabaseItem } from "../../databases/local-databases";
 import { ChildAstItem, AstItem } from "./ast-viewer";
 import { Uri } from "vscode";

extensions/ql-vscode/src/language-support/ast-viewer/ast-viewer.ts

@@ -16,16 +16,16 @@ import {
 import { basename } from "path";
 
 import { DatabaseItem } from "../../databases/local-databases";
-import { UrlValue, BqrsId } from "../../pure/bqrs-cli-types";
+import { UrlValue, BqrsId } from "../../common/bqrs-cli-types";
 import { showLocation } from "../../databases/local-databases/locations";
 import {
   isStringLoc,
   isWholeFileLoc,
   isLineColumnLoc,
-} from "../../pure/bqrs-utils";
-import { DisposableObject } from "../../pure/disposable-object";
-import { asError, getErrorMessage } from "../../pure/helpers-pure";
-import { redactableError } from "../../pure/errors";
+} from "../../common/bqrs-utils";
+import { DisposableObject } from "../../common/disposable-object";
+import { asError, getErrorMessage } from "../../common/helpers-pure";
+import { redactableError } from "../../common/errors";
 import { AstViewerCommands } from "../../common/commands";
 import { extLogger } from "../../common/logging/vscode";
 import { showAndLogExceptionWithTelemetry } from "../../common/logging";

extensions/ql-vscode/src/language-support/contextual/file-range-from-uri.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode";
 
-import { UrlValue, LineColumnLocation } from "../../pure/bqrs-cli-types";
-import { isEmptyPath } from "../../pure/bqrs-utils";
+import { UrlValue, LineColumnLocation } from "../../common/bqrs-cli-types";
+import { isEmptyPath } from "../../common/bqrs-utils";
 import { DatabaseItem } from "../../databases/local-databases";
 
 export function fileRangeFromURI(

extensions/ql-vscode/src/language-support/contextual/location-finder.ts

@@ -7,7 +7,7 @@ import {
   EntityValue,
   getResultSetSchema,
   ResultSetSchema,
-} from "../../pure/bqrs-cli-types";
+} from "../../common/bqrs-cli-types";
 import { CodeQLCliServer } from "../../codeql-cli/cli";
 import { DatabaseManager, DatabaseItem } from "../../databases/local-databases";
 import { ProgressCallback } from "../../common/vscode/progress";

extensions/ql-vscode/src/language-support/contextual/query-resolver.ts

@@ -25,7 +25,7 @@ import {
 import { CancellationToken } from "vscode";
 import { ProgressCallback } from "../../common/vscode/progress";
 import { CoreCompletedQuery, QueryRunner } from "../../query-server";
-import { redactableError } from "../../pure/errors";
+import { redactableError } from "../../common/errors";
 import { QLPACK_FILENAMES } from "../../pure/ql";
 import { telemetryListener } from "../../common/vscode/telemetry";
 

extensions/ql-vscode/src/language-support/query-editor.ts

@@ -2,8 +2,8 @@ import { Uri, window } from "vscode";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { QueryRunner } from "../query-server";
 import { basename, join } from "path";
-import { getErrorMessage } from "../pure/helpers-pure";
-import { redactableError } from "../pure/errors";
+import { getErrorMessage } from "../common/helpers-pure";
+import { redactableError } from "../common/errors";
 import { AppCommandManager, QueryEditorCommands } from "../common/commands";
 import { extLogger } from "../common/logging/vscode";
 import { showAndLogExceptionWithTelemetry } from "../common/logging";

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

@@ -18,7 +18,7 @@ import {
   showAndLogWarningMessage,
 } from "../common/logging";
 import { isCanary, MAX_QUERIES } from "../config";
-import { gatherQlFiles } from "../pure/files";
+import { gatherQlFiles } from "../common/files";
 import { basename } from "path";
 import { showBinaryChoiceDialog } from "../common/vscode/dialog";
 import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
@@ -39,11 +39,11 @@ import {
 } from "../run-queries-shared";
 import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
 import { WebviewReveal } from "./webview";
-import { asError, getErrorMessage } from "../pure/helpers-pure";
+import { asError, getErrorMessage } from "../common/helpers-pure";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { LocalQueryCommands } from "../common/commands";
 import { App } from "../common/app";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { SkeletonQueryWizard } from "../skeleton-query-wizard";
 import { LocalQueryRun } from "./local-query-run";
 import { createMultiSelectionCommand } from "../common/vscode/selection-commands";

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

@@ -20,7 +20,7 @@ import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
 import { WebviewReveal } from "./webview";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { QueryResultType } from "../pure/new-messages";
-import { redactableError } from "../pure/errors";
+import { redactableError } from "../common/errors";
 import { LocalQueries } from "./local-queries";
 import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";
 import { telemetryListener } from "../common/vscode/telemetry";

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

@@ -12,7 +12,7 @@ import {
   ProgressCallback,
   UserCancellationException,
 } from "../common/vscode/progress";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "../common/helpers-pure";
 import { FALLBACK_QLPACK_FILENAME, getQlPackPath } from "../pure/ql";
 import { App } from "../common/app";
 

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

@@ -22,7 +22,7 @@ import {
   assertNever,
   getErrorMessage,
   getErrorStack,
-} from "../pure/helpers-pure";
+} from "../common/helpers-pure";
 import {
   FromResultsViewMsg,
   Interpretation,
@@ -64,7 +64,7 @@ import {
   RawResultSet,
   transformBqrsResultSet,
   ResultSetSchema,
-} from "../pure/bqrs-cli-types";
+} from "../common/bqrs-cli-types";
 import {
   AbstractWebview,
   WebviewPanelConfig,
@@ -72,7 +72,7 @@ import {
 import { isCanary, PAGE_SIZE } from "../config";
 import { HistoryItemLabelProvider } from "../query-history/history-item-label-provider";
 import { telemetryListener } from "../common/vscode/telemetry";
-import { redactableError } from "../pure/errors";
+import { redactableError } from "../common/errors";
 import { ResultsViewCommands } from "../common/commands";
 
 /**

extensions/ql-vscode/src/log-insights/log-scanner-service.ts

@@ -1,5 +1,5 @@
 import { Diagnostic, DiagnosticSeverity, languages, Range, Uri } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QueryHistoryInfo } from "../query-history/query-history-info";
 import {
   EvaluationLogProblemReporter,

extensions/ql-vscode/src/log-insights/summary-language-support.ts

@@ -11,9 +11,9 @@ import {
   window,
   workspace,
 } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { extLogger } from "../common/logging/vscode";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "../common/helpers-pure";
 import { SummaryLanguageSupportCommands } from "../common/commands";
 import { App } from "../common/app";
 

extensions/ql-vscode/src/packaging/packaging.ts

@@ -11,8 +11,8 @@ import {
   showAndLogExceptionWithTelemetry,
   showAndLogInformationMessage,
 } from "../common/logging";
-import { asError, getErrorStack } from "../pure/helpers-pure";
-import { redactableError } from "../pure/errors";
+import { asError, getErrorStack } from "../common/helpers-pure";
+import { redactableError } from "../common/errors";
 import { PACKS_BY_QUERY_LANGUAGE } from "../common/query-language";
 import { PackagingCommands } from "../common/commands";
 import { telemetryListener } from "../common/vscode/telemetry";

extensions/ql-vscode/src/pure/interface-types.ts

@@ -5,7 +5,7 @@ import {
   ResultSetSchema,
   Column,
   ResolvableLocationValue,
-} from "./bqrs-cli-types";
+} from "../common/bqrs-cli-types";
 import {
   VariantAnalysis,
   VariantAnalysisScannedRepositoryResult,
@@ -15,7 +15,7 @@ import {
   RepositoriesFilterSortState,
   RepositoriesFilterSortStateWithIds,
 } from "./variant-analysis-filter-sort";
-import { ErrorLike } from "./errors";
+import { ErrorLike } from "../common/errors";
 import { DataFlowPaths } from "../variant-analysis/shared/data-flow-paths";
 import { ExternalApiUsage } from "../data-extensions-editor/external-api-usage";
 import { ModeledMethod } from "../data-extensions-editor/modeled-method";

extensions/ql-vscode/src/pure/sarif-utils.ts

@@ -1,6 +1,6 @@
 import * as Sarif from "sarif";
 import type { HighlightedRegion } from "../variant-analysis/shared/analysis-result";
-import { ResolvableLocationValue } from "./bqrs-cli-types";
+import { ResolvableLocationValue } from "../common/bqrs-cli-types";
 
 export interface SarifLink {
   dest: number;

extensions/ql-vscode/src/pure/variant-analysis-filter-sort.ts

@@ -2,8 +2,8 @@ import {
   Repository,
   RepositoryWithMetadata,
 } from "../variant-analysis/shared/repository";
-import { parseDate } from "./date";
-import { assertNever } from "./helpers-pure";
+import { parseDate } from "../common/date";
+import { assertNever } from "../common/helpers-pure";
 
 export enum FilterKey {
   All = "all",

extensions/ql-vscode/src/queries-panel/queries-module.ts

@@ -2,7 +2,7 @@ import { CodeQLCliServer } from "../codeql-cli/cli";
 import { extLogger } from "../common/logging/vscode";
 import { App } from "../common/app";
 import { isCanary, showQueriesPanel } from "../config";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QueriesPanel } from "./queries-panel";
 import { QueryDiscovery } from "./query-discovery";
 import { QueryPackDiscovery } from "./query-pack-discovery";

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

@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QueryTreeDataProvider } from "./query-tree-data-provider";
 import { QueryDiscovery } from "./query-discovery";
 

extensions/ql-vscode/src/queries-panel/query-discovery.ts

@@ -8,7 +8,7 @@ import {
 } from "../common/file-tree-nodes";
 import { QueryDiscoverer } from "./query-tree-data-provider";
 import { FilePathDiscovery } from "../common/vscode/file-path-discovery";
-import { containsPath } from "../pure/files";
+import { containsPath } from "../common/files";
 import { getOnDiskWorkspaceFoldersObjects } from "../common/vscode/workspace-folders";
 import { QueryLanguage } from "../common/query-language";
 

extensions/ql-vscode/src/queries-panel/query-pack-discovery.ts

@@ -4,10 +4,10 @@ import { Event } from "vscode";
 import { QueryLanguage, dbSchemeToLanguage } from "../common/query-language";
 import { FALLBACK_QLPACK_FILENAME, QLPACK_FILENAMES } from "../pure/ql";
 import { FilePathDiscovery } from "../common/vscode/file-path-discovery";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "../common/helpers-pure";
 import { extLogger } from "../common/logging/vscode";
 import { EOL } from "os";
-import { containsPath } from "../pure/files";
+import { containsPath } from "../common/files";
 import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
 
 export interface QueryPack {

extensions/ql-vscode/src/queries-panel/query-tree-data-provider.ts

@@ -1,6 +1,6 @@
 import { Event, EventEmitter, TreeDataProvider, TreeItem } from "vscode";
 import { QueryTreeViewItem } from "./query-tree-view-item";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { FileTreeNode } from "../common/file-tree-nodes";
 
 export interface QueryDiscoverer {

extensions/ql-vscode/src/query-evaluation-logging/eval-log-viewer.ts

@@ -8,9 +8,9 @@ import {
   EventEmitter,
   TreeItemCollapsibleState,
 } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
-import { asError, getErrorMessage } from "../pure/helpers-pure";
-import { redactableError } from "../pure/errors";
+import { DisposableObject } from "../common/disposable-object";
+import { asError, getErrorMessage } from "../common/helpers-pure";
+import { redactableError } from "../common/errors";
 import { EvalLogViewerCommands } from "../common/commands";
 import { extLogger } from "../common/logging/vscode";
 import { showAndLogExceptionWithTelemetry } from "../common/logging";

extensions/ql-vscode/src/query-history/history-item-label-provider.ts

@@ -8,7 +8,7 @@ import {
   QueryHistoryInfo,
 } from "./query-history-info";
 import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
-import { assertNever } from "../pure/helpers-pure";
+import { assertNever } from "../common/helpers-pure";
 import { pluralize } from "../pure/word";
 import { humanizeQueryStatus } from "../query-status";
 

extensions/ql-vscode/src/query-history/history-tree-data-provider.ts

@@ -8,8 +8,8 @@ import {
   TreeDataProvider,
   TreeItem,
 } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
-import { assertNever } from "../pure/helpers-pure";
+import { DisposableObject } from "../common/disposable-object";
+import { assertNever } from "../common/helpers-pure";
 import { QueryHistoryInfo } from "./query-history-info";
 import { QueryStatus } from "../query-status";
 import { HistoryItemLabelProvider } from "./history-item-label-provider";

extensions/ql-vscode/src/query-history/query-history-info.ts

@@ -1,6 +1,6 @@
 import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
 import { LocalQueryInfo } from "../query-results";
-import { assertNever } from "../pure/helpers-pure";
+import { assertNever } from "../common/helpers-pure";
 import { pluralize } from "../pure/word";
 import {
   hasRepoScanCompleted,

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -18,9 +18,9 @@ import {
   showInformationMessageWithAction,
 } from "../common/vscode/dialog";
 import { URLSearchParams } from "url";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "../pure/time";
-import { assertNever, getErrorMessage } from "../pure/helpers-pure";
+import { assertNever, getErrorMessage } from "../common/helpers-pure";
 import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
 import {
   getActionsWorkflowRunUrl,

extensions/ql-vscode/src/query-history/query-history-scrubber.ts

@@ -3,7 +3,7 @@ import { EOL } from "os";
 import { join } from "path";
 import { Disposable, ExtensionContext } from "vscode";
 import { extLogger } from "../common/logging/vscode";
-import { readDirFullPaths } from "../pure/files";
+import { readDirFullPaths } from "../common/files";
 import { QueryHistoryDirs } from "./query-history-dirs";
 import { QueryHistoryManager } from "./query-history-manager";
 

extensions/ql-vscode/src/query-history/store/query-history-domain-mapper.ts

@@ -1,4 +1,4 @@
-import { assertNever } from "../../pure/helpers-pure";
+import { assertNever } from "../../common/helpers-pure";
 import { QueryHistoryInfo } from "../query-history-info";
 import { mapLocalQueryInfoToDto } from "./query-history-local-query-domain-mapper";
 import { QueryHistoryItemDto } from "./query-history-dto";

extensions/ql-vscode/src/query-history/store/query-history-store.ts

@@ -6,9 +6,9 @@ import {
   asyncFilter,
   getErrorMessage,
   getErrorStack,
-} from "../../pure/helpers-pure";
+} from "../../common/helpers-pure";
 import { QueryHistoryInfo } from "../query-history-info";
-import { redactableError } from "../../pure/errors";
+import { redactableError } from "../../common/errors";
 import { QueryHistoryDto, QueryHistoryItemDto } from "./query-history-dto";
 import { mapQueryHistoryToDomainModel } from "./query-history-dto-mapper";
 import { mapQueryHistoryToDto } from "./query-history-domain-mapper";

extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-domain-mapper.ts

@@ -21,7 +21,7 @@ import {
   VariantAnalysisSkippedRepositoryGroup,
   VariantAnalysisStatus,
 } from "../../variant-analysis/shared/variant-analysis";
-import { assertNever } from "../../pure/helpers-pure";
+import { assertNever } from "../../common/helpers-pure";
 import { QueryLanguage } from "../../common/query-language";
 import { QueryStatus } from "../../query-status";
 import { VariantAnalysisHistoryItem } from "../variant-analysis-history-item";

extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-dto-mapper.ts

@@ -21,7 +21,7 @@ import {
   VariantAnalysisSkippedRepositoryGroup,
   VariantAnalysisStatus,
 } from "../../variant-analysis/shared/variant-analysis";
-import { assertNever } from "../../pure/helpers-pure";
+import { assertNever } from "../../common/helpers-pure";
 import { QueryLanguage } from "../../common/query-language";
 import { QueryStatus } from "../../query-status";
 import { VariantAnalysisHistoryItem } from "../variant-analysis-history-item";

extensions/ql-vscode/src/query-server/legacy/query-server-client.ts

@@ -1,6 +1,6 @@
 import { ensureFile } from "fs-extra";
 
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../../common/disposable-object";
 import { CancellationToken } from "vscode";
 import { createMessageConnection, RequestType } from "vscode-jsonrpc/node";
 import * as cli from "../../codeql-cli/cli";

extensions/ql-vscode/src/query-server/legacy/run-queries.ts

@@ -21,10 +21,10 @@ import {
 import * as messages from "../../pure/legacy-messages";
 import * as newMessages from "../../pure/new-messages";
 import * as qsClient from "./query-server-client";
-import { asError, getErrorMessage } from "../../pure/helpers-pure";
+import { asError, getErrorMessage } from "../../common/helpers-pure";
 import { compileDatabaseUpgradeSequence } from "./upgrades";
 import { QueryEvaluationInfo, QueryOutputDir } from "../../run-queries-shared";
-import { redactableError } from "../../pure/errors";
+import { redactableError } from "../../common/errors";
 import { CoreQueryResults, CoreQueryTarget } from "../query-runner";
 import { Position } from "../../pure/messages-shared";
 import { ensureDirSync } from "fs-extra";

extensions/ql-vscode/src/query-server/legacy/upgrades.ts

@@ -12,8 +12,8 @@ import * as qsClient from "./query-server-client";
 import * as tmp from "tmp-promise";
 import { dirname } from "path";
 import { DatabaseItem } from "../../databases/local-databases";
-import { asError, getErrorMessage } from "../../pure/helpers-pure";
-import { redactableError } from "../../pure/errors";
+import { asError, getErrorMessage } from "../../common/helpers-pure";
+import { redactableError } from "../../common/errors";
 import { telemetryListener } from "../../common/vscode/telemetry";
 
 /**

extensions/ql-vscode/src/query-server/query-server-client.ts

@@ -1,6 +1,6 @@
 import { ensureFile } from "fs-extra";
 
-import { DisposableObject, DisposeHandler } from "../pure/disposable-object";
+import { DisposableObject, DisposeHandler } from "../common/disposable-object";
 import { CancellationToken } from "vscode";
 import { createMessageConnection, RequestType } from "vscode-jsonrpc/node";
 import * as cli from "../codeql-cli/cli";

extensions/ql-vscode/src/query-status.ts

@@ -1,4 +1,4 @@
-import { assertNever } from "./pure/helpers-pure";
+import { assertNever } from "./common/helpers-pure";
 import { VariantAnalysisStatus } from "./variant-analysis/shared/variant-analysis";
 
 export enum QueryStatus {

extensions/ql-vscode/src/query-testing/test-adapter.ts

@@ -15,7 +15,7 @@ import {
 import { TestAdapterRegistrar } from "vscode-test-adapter-util";
 import { QLTestDiscovery } from "./qltest-discovery";
 import { Event, EventEmitter, CancellationTokenSource } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { CodeQLCliServer, TestCompleted } from "../codeql-cli/cli";
 import { testLogger } from "../common/logging/vscode";
 import { TestRunner } from "./test-runner";

extensions/ql-vscode/src/query-testing/test-manager-base.ts

@@ -1,6 +1,6 @@
 import { copy, createFile, lstat, pathExists } from "fs-extra";
 import { TestUICommands } from "../common/commands";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { getActualFile, getExpectedFile } from "./test-adapter";
 import { TestItem, TextDocumentShowOptions, Uri, window } from "vscode";
 import { basename } from "path";

extensions/ql-vscode/src/query-testing/test-manager.ts

@@ -15,10 +15,10 @@ import {
   tests,
   workspace,
 } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QLTestDiscovery } from "./qltest-discovery";
 import { CodeQLCliServer } from "../codeql-cli/cli";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "../common/helpers-pure";
 import { BaseLogger, LogOptions } from "../common/logging";
 import { TestRunner } from "./test-runner";
 import { TestManagerBase } from "./test-manager-base";

extensions/ql-vscode/src/query-testing/test-runner.ts

@@ -2,8 +2,8 @@ import { CancellationToken, Uri } from "vscode";
 import { CodeQLCliServer, TestCompleted } from "../codeql-cli/cli";
 import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
 import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
-import { asError, getErrorMessage } from "../pure/helpers-pure";
-import { redactableError } from "../pure/errors";
+import { asError, getErrorMessage } from "../common/helpers-pure";
+import { redactableError } from "../common/errors";
 import { access } from "fs-extra";
 import { extLogger } from "../common/logging/vscode";
 import {
@@ -11,7 +11,7 @@ import {
   showAndLogExceptionWithTelemetry,
   showAndLogWarningMessage,
 } from "../common/logging";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { telemetryListener } from "../common/vscode/telemetry";
 
 async function isFileAccessible(uri: Uri): Promise<boolean> {

extensions/ql-vscode/src/query-testing/test-ui.ts

@@ -8,7 +8,7 @@ import {
   TestSuiteEvent,
 } from "vscode-test-adapter-api";
 import { TestTreeNode } from "./test-tree-node";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QLTestAdapter } from "./test-adapter";
 import { App } from "../common/app";
 import { TestManagerBase } from "./test-manager-base";

extensions/ql-vscode/src/run-queries-shared.ts

@@ -27,11 +27,11 @@ import { nanoid } from "nanoid";
 import { CodeQLCliServer } from "./codeql-cli/cli";
 import { SELECT_QUERY_NAME } from "./language-support";
 import { DatabaseManager } from "./databases/local-databases";
-import { DecodedBqrsChunk, EntityValue } from "./pure/bqrs-cli-types";
+import { DecodedBqrsChunk, EntityValue } from "./common/bqrs-cli-types";
 import { BaseLogger, showAndLogWarningMessage } from "./common/logging";
 import { extLogger } from "./common/logging/vscode";
 import { generateSummarySymbolsFile } from "./log-insights/summary-parser";
-import { getErrorMessage } from "./pure/helpers-pure";
+import { getErrorMessage } from "./common/helpers-pure";
 
 /**
  * run-queries.ts

extensions/ql-vscode/src/skeleton-query-wizard.ts

@@ -8,7 +8,7 @@ import {
   getFirstWorkspaceFolder,
   isFolderAlreadyInWorkspace,
 } from "./common/vscode/workspace-folders";
-import { getErrorMessage } from "./pure/helpers-pure";
+import { getErrorMessage } from "./common/helpers-pure";
 import { QlPackGenerator } from "./qlpack-generator";
 import { DatabaseItem, DatabaseManager } from "./databases/local-databases";
 import {

extensions/ql-vscode/src/status-bar.ts

@@ -11,7 +11,7 @@ import {
   CUSTOM_CODEQL_PATH_SETTING,
   DistributionConfigListener,
 } from "./config";
-import { DisposableObject } from "./pure/disposable-object";
+import { DisposableObject } from "./common/disposable-object";
 
 /**
  * Creates and manages a status bar item for codeql. THis item contains

extensions/ql-vscode/src/variant-analysis/bqrs-processing.ts

@@ -1,6 +1,6 @@
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { Logger } from "../common/logging";
-import { transformBqrsResultSet } from "../pure/bqrs-cli-types";
+import { transformBqrsResultSet } from "../common/bqrs-cli-types";
 import { AnalysisRawResults } from "./shared/analysis-result";
 import { MAX_RAW_RESULTS } from "./shared/result-limits";
 import { SELECT_TABLE_NAME } from "../pure/interface-types";

extensions/ql-vscode/src/variant-analysis/data-flow-paths-view.ts

@@ -3,14 +3,14 @@ import {
   AbstractWebview,
   WebviewPanelConfig,
 } from "../common/vscode/abstract-webview";
-import { assertNever } from "../pure/helpers-pure";
+import { assertNever } from "../common/helpers-pure";
 import { telemetryListener } from "../common/vscode/telemetry";
 import {
   FromDataFlowPathsMessage,
   ToDataFlowPathsMessage,
 } from "../pure/interface-types";
 import { DataFlowPaths } from "./shared/data-flow-paths";
-import { redactableError } from "../pure/errors";
+import { redactableError } from "../common/errors";
 import { extLogger } from "../common/logging/vscode";
 import { showAndLogExceptionWithTelemetry } from "../common/logging";
 

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/mock-gh-api-server.ts

@@ -2,11 +2,11 @@ import { join, resolve } from "path";
 import { pathExists } from "fs-extra";
 import { setupServer, SetupServer } from "msw/node";
 
-import { DisposableObject } from "../../../pure/disposable-object";
+import { DisposableObject } from "../../../common/disposable-object";
 
 import { Recorder } from "./recorder";
 import { createRequestHandlers } from "./request-handlers";
-import { getDirectoryNamesInsidePath } from "../../../pure/files";
+import { getDirectoryNamesInsidePath } from "../../../common/files";
 
 /**
  * Enables mocking of the GitHub API server via HTTP interception, using msw.

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/recorder.ts

@@ -8,7 +8,7 @@ import { IsomorphicResponse } from "@mswjs/interceptors";
 import { Headers } from "headers-polyfill";
 import fetch from "node-fetch";
 
-import { DisposableObject } from "../../../pure/disposable-object";
+import { DisposableObject } from "../../../common/disposable-object";
 
 import {
   GetVariantAnalysisRepoResultRequest,

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/vscode-mock-gh-api-server.ts

@@ -5,7 +5,7 @@ import {
   getMockGitHubApiServerScenariosPath,
   MockGitHubApiConfigListener,
 } from "../../../config";
-import { DisposableObject } from "../../../pure/disposable-object";
+import { DisposableObject } from "../../../common/disposable-object";
 import { MockGitHubApiServer } from "./mock-gh-api-server";
 import { MockGitHubApiServerCommands } from "../../../common/commands";
 import { App, AppMode } from "../../../common/app";