Move helpers-pure.ts to /common

Author: robertbrignull

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.

…sions/ql-vscode/src/pure/helpers-pure.ts …ons/ql-vscode/src/common/helpers-pure.tsextensions/ql-vscode/src/pure/helpers-pure.ts renamed to extensions/ql-vscode/src/common/helpers-pure.ts extensions/ql-vscode/src/pure/helpers-pure.ts renamed to 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 {
-  asError,
-  getErrorMessage,
-  getErrorStack,
-} from "../../pure/helpers-pure";
+import { asError, getErrorMessage, getErrorStack } from "../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 {
-  asError,
-  getErrorMessage,
-  getErrorStack,
-} from "../../pure/helpers-pure";
+import { asError, getErrorMessage, getErrorStack } from "../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,