Move helpers-pure.ts to /common

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

@@ -21,7 +21,7 @@ import {
   assertNever,
   getErrorMessage,
   getErrorStack,
-} from "../pure/helpers-pure";
+} from "../common/helpers-pure";
 import { walkDirectory } from "../common/files";
 import { QueryMetadata, SortDirection } from "../pure/interface-types";
 import { BaseLogger, Logger, ProgressReporter } from "../common";

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

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

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/helpers-pure.ts

@@ -5,7 +5,7 @@
  * Helper functions that don't depend on vscode or the CLI and therefore can be used by the front-end and pure unit tests.
  */
 
-import { RedactableError } from "../common/errors";
+import { RedactableError } from "./errors";
 
 /**
  * This error is used to indicate a runtime failure of an exhaustivity check enforced at compile time.

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/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/vscode/commands.ts

@@ -6,11 +6,7 @@ import {
   showAndLogWarningMessage,
   showAndLogExceptionWithTelemetry,
 } from "../logging";
-import {
+import { asError, getErrorMessage, getErrorStack } from "../helpers-pure";
-  asError,
-  getErrorMessage,
-  getErrorStack,
-} from "../../pure/helpers-pure";
 import { redactableError } from "../errors";
 import { UserCancellationException } from "./progress";
 import { telemetryListener } from "./telemetry";

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

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

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

@@ -17,7 +17,7 @@ import {
 } 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,

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

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

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

@@ -11,7 +11,7 @@ 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 "../common/files";

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

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

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

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

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

@@ -22,7 +22,7 @@ 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 "../../common/errors";
 import { remove } from "fs-extra";

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

@@ -19,7 +19,7 @@ import {
   isLineColumnLoc,
   tryGetResolvableLocation,
 } from "../../common/bqrs-utils";
-import { getErrorMessage } from "../../pure/helpers-pure";
+import { getErrorMessage } from "../../common/helpers-pure";
 import { Logger } from "../../common";
 import { DatabaseItem } from "./database-item";
 import { DatabaseManager } from "./database-manager";

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

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

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

@@ -17,7 +17,7 @@ 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 { getErrorMessage } from "../common/helpers-pure";
 import { DisposableObject } from "../common/disposable-object";
 
 // More complete implementations of `Event` for certain events, because the classes from

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,

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

@@ -24,7 +24,7 @@ import {
   isLineColumnLoc,
 } from "../../common/bqrs-utils";
 import { DisposableObject } from "../../common/disposable-object";
-import { asError, getErrorMessage } from "../../pure/helpers-pure";
+import { asError, getErrorMessage } from "../../common/helpers-pure";
 import { redactableError } from "../../common/errors";
 import { AstViewerCommands } from "../../common/commands";
 import { extLogger } from "../../common";

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

@@ -2,7 +2,7 @@ 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 { getErrorMessage } from "../common/helpers-pure";
 import { redactableError } from "../common/errors";
 import { AppCommandManager, QueryEditorCommands } from "../common/commands";
 import { extLogger } from "../common";

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

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

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,

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

@@ -13,7 +13,7 @@ import {
 } from "vscode";
 import { DisposableObject } from "../common/disposable-object";
 import { extLogger } from "../common";
-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,7 +11,7 @@ import {
   showAndLogExceptionWithTelemetry,
   showAndLogInformationMessage,
 } from "../common/logging";
-import { asError, getErrorStack } from "../pure/helpers-pure";
+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";

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

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

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

@@ -4,7 +4,7 @@ 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";
 import { EOL } from "os";
 import { containsPath } from "../common/files";

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

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

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

@@ -9,7 +9,7 @@ import {
   TreeItem,
 } from "vscode";
 import { DisposableObject } from "../common/disposable-object";
-import { assertNever } from "../pure/helpers-pure";
+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

@@ -20,7 +20,7 @@ import {
 import { URLSearchParams } from "url";
 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/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,7 +6,7 @@ import {
   asyncFilter,
   getErrorMessage,
   getErrorStack,
-} from "../../pure/helpers-pure";
+} from "../../common/helpers-pure";
 import { QueryHistoryInfo } from "../query-history-info";
 import { redactableError } from "../../common/errors";
 import { QueryHistoryDto, QueryHistoryItemDto } from "./query-history-dto";

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/run-queries.ts

@@ -20,7 +20,7 @@ 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 "../../common/errors";

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

@@ -12,7 +12,7 @@ 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 { asError, getErrorMessage } from "../../common/helpers-pure";
 import { redactableError } from "../../common/errors";
 import { telemetryListener } from "../../common/vscode/telemetry";
 

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-manager.ts

@@ -18,7 +18,7 @@ import {
 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";
 import { TestRunner } from "./test-runner";
 import { TestManagerBase } from "./test-manager-base";

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

@@ -2,7 +2,7 @@ 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 { asError, getErrorMessage } from "../common/helpers-pure";
 import { redactableError } from "../common/errors";
 import { access } from "fs-extra";
 import { BaseLogger, extLogger } from "../common";

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

@@ -30,7 +30,7 @@ import { DatabaseManager } from "./databases/local-databases";
 import { DecodedBqrsChunk, EntityValue } from "./common/bqrs-cli-types";
 import { BaseLogger, extLogger } from "./common";
 import { generateSummarySymbolsFile } from "./log-insights/summary-parser";
-import { getErrorMessage } from "./pure/helpers-pure";
+import { getErrorMessage } from "./common/helpers-pure";
 import { showAndLogWarningMessage } from "./common/logging";
 
 /**

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/variant-analysis/data-flow-paths-view.ts

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

extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-domain-mapper.ts

@@ -1,4 +1,4 @@
-import { assertNever } from "../../pure/helpers-pure";
+import { assertNever } from "../../common/helpers-pure";
 import {
   VariantAnalysisScannedRepositoryState,
   VariantAnalysisScannedRepositoryDownloadStatus,

extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-dto-mapper.ts

@@ -1,4 +1,4 @@
-import { assertNever } from "../../pure/helpers-pure";
+import { assertNever } from "../../common/helpers-pure";
 import {
   VariantAnalysisScannedRepositoryDownloadStatus,
   VariantAnalysisScannedRepositoryState,

extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-domain-mapper.ts

@@ -1,4 +1,4 @@
-import { assertNever } from "../../pure/helpers-pure";
+import { assertNever } from "../../common/helpers-pure";
 import {
   VariantAnalysisRepositoryTask,
   VariantAnalysisRepoStatus,

extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-dto-mapper.ts

@@ -1,4 +1,4 @@
-import { assertNever } from "../../pure/helpers-pure";
+import { assertNever } from "../../common/helpers-pure";
 import {
   VariantAnalysisRepositoryTask,
   VariantAnalysisRepoStatus,

extensions/ql-vscode/src/variant-analysis/run-remote-query.ts

@@ -19,7 +19,7 @@ import {
 } 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";
+import { getErrorMessage, REPO_REGEX } from "../common/helpers-pure";
 import { getRepositoryFromNwo } from "./gh-api/gh-api-client";
 import {
   getRepositorySelection,

extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts

@@ -30,7 +30,7 @@ import {
   VariantAnalysisScannedRepositoryState,
   VariantAnalysisSubmission,
 } from "./shared/variant-analysis";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "../common/helpers-pure";
 import { VariantAnalysisView } from "./variant-analysis-view";
 import { VariantAnalysisViewManager } from "./variant-analysis-view-manager";
 import {

extensions/ql-vscode/src/variant-analysis/variant-analysis-monitor.ts

@@ -12,7 +12,7 @@ import { VariantAnalysis as ApiVariantAnalysis } from "./gh-api/variant-analysis
 import { processUpdatedVariantAnalysis } from "./variant-analysis-processor";
 import { DisposableObject } from "../common/disposable-object";
 import { sleep } from "../pure/time";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { getErrorMessage } from "../common/helpers-pure";
 import { App } from "../common/app";
 import { showAndLogWarningMessage } from "../common/logging";
 

extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts

@@ -11,7 +11,7 @@ import {
   FromVariantAnalysisMessage,
   ToVariantAnalysisMessage,
 } from "../pure/interface-types";
-import { assertNever } from "../pure/helpers-pure";
+import { assertNever } from "../common/helpers-pure";
 import {
   VariantAnalysis,
   VariantAnalysisScannedRepositoryResult,

extensions/ql-vscode/src/view/common/errors.ts

@@ -1,4 +1,4 @@
-import { getErrorMessage, getErrorStack } from "../../pure/helpers-pure";
+import { getErrorMessage, getErrorStack } from "../../common/helpers-pure";
 import { vscode } from "../vscode-api";
 
 // Keep track of previous errors that have happened.

extensions/ql-vscode/src/view/data-extensions-editor/DataExtensionsEditor.tsx

@@ -8,7 +8,7 @@ import { VSCodeButton } from "@vscode/webview-ui-toolkit/react";
 import styled from "styled-components";
 import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";
 import { ModeledMethod } from "../../data-extensions-editor/modeled-method";
-import { assertNever } from "../../pure/helpers-pure";
+import { assertNever } from "../../common/helpers-pure";
 import { vscode } from "../vscode-api";
 import { calculateModeledPercentage } from "./modeled";
 import { LinkIconButton } from "../variant-analysis/LinkIconButton";

extensions/ql-vscode/src/view/results/result-table-utils.tsx

@@ -7,7 +7,7 @@ import {
   SortDirection,
   ResultSet,
 } from "../../pure/interface-types";
-import { assertNever } from "../../pure/helpers-pure";
+import { assertNever } from "../../common/helpers-pure";
 import { vscode } from "../vscode-api";
 import { convertNonPrintableChars } from "../../pure/text-utils";
 import { sendTelemetry } from "../common/telemetry";

extensions/ql-vscode/src/view/results/results.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { assertNever, getErrorMessage } from "../../pure/helpers-pure";
+import { assertNever, getErrorMessage } from "../../common/helpers-pure";
 import {
   DatabaseInfo,
   Interpretation,

extensions/ql-vscode/test/unit-tests/pure/helpers-pure.test.ts

@@ -1,4 +1,4 @@
-import { asyncFilter, getErrorMessage } from "../../../src/pure/helpers-pure";
+import { asyncFilter, getErrorMessage } from "../../../src/common/helpers-pure";
 
 describe("helpers-pure", () => {
   it("should filter asynchronously", async () => {

extensions/ql-vscode/test/vscode-tests/cli-integration/packaging/packaging.test.ts

@@ -2,7 +2,7 @@ import { window } from "vscode";
 import { join } from "path";
 
 import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
-import { getErrorMessage } from "../../../../src/pure/helpers-pure";
+import { getErrorMessage } from "../../../../src/common/helpers-pure";
 
 import * as log from "../../../../src/common/logging/notifications";
 import {

extensions/ql-vscode/test/vscode-tests/cli-integration/skeleton-query-wizard.test.ts

@@ -19,7 +19,7 @@ import {
 } from "../../../src/databases/local-databases";
 import * as databaseFetcher from "../../../src/databases/database-fetcher";
 import { createMockDB } from "../../factories/databases/databases";
-import { asError } from "../../../src/pure/helpers-pure";
+import { asError } from "../../../src/common/helpers-pure";
 import { Setting } from "../../../src/config";
 
 describe("SkeletonQueryWizard", () => {

extensions/ql-vscode/test/vscode-tests/minimal-workspace/qlpack-generator.test.ts

@@ -4,7 +4,7 @@ import { QlPackGenerator } from "../../../src/qlpack-generator";
 import { QueryLanguage } from "../../../src/common/query-language";
 import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
 import { Uri, workspace } from "vscode";
-import { getErrorMessage } from "../../../src/pure/helpers-pure";
+import { getErrorMessage } from "../../../src/common/helpers-pure";
 import * as tmp from "tmp";
 import { mockedObject } from "../utils/mocking.helpers";
 

extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/contextual/query-resolver.test.ts

@@ -1,7 +1,7 @@
 import { load } from "js-yaml";
 import * as fs from "fs-extra";
 
-import { getErrorMessage } from "../../../../../src/pure/helpers-pure";
+import { getErrorMessage } from "../../../../../src/common/helpers-pure";
 
 import * as log from "../../../../../src/common/logging/notifications";
 import * as workspaceFolders from "../../../../../src/common/vscode/workspace-folders";