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

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

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

…ons/ql-vscode/src/pure/bqrs-cli-types.ts …s/ql-vscode/src/common/bqrs-cli-types.tsextensions/ql-vscode/src/pure/bqrs-cli-types.ts renamed to extensions/ql-vscode/src/common/bqrs-cli-types.ts extensions/ql-vscode/src/pure/bqrs-cli-types.ts renamed to extensions/ql-vscode/src/common/bqrs-cli-types.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

…ensions/ql-vscode/src/pure/bqrs-utils.ts …sions/ql-vscode/src/common/bqrs-utils.tsextensions/ql-vscode/src/pure/bqrs-utils.ts renamed to extensions/ql-vscode/src/common/bqrs-utils.ts extensions/ql-vscode/src/pure/bqrs-utils.ts renamed to extensions/ql-vscode/src/common/bqrs-utils.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";
 
 /**