Move ql.ts to /common

Author: robertbrignull

extensions/ql-vscode/src/pure/ql.ts extensions/ql-vscode/src/common/ql.tsextensions/ql-vscode/src/pure/ql.ts renamed to extensions/ql-vscode/src/common/ql.ts

@@ -10,7 +10,7 @@ import {
 } from "../common/vscode/workspace-folders";
 import { ProgressCallback } from "../common/vscode/progress";
 import { DatabaseItem } from "../databases/local-databases";
-import { getQlPackPath, QLPACK_FILENAMES } from "../pure/ql";
+import { getQlPackPath, QLPACK_FILENAMES } from "../common/ql";
 import { getErrorMessage } from "../common/helpers-pure";
 import { ExtensionPack, ExtensionPackModelFile } from "./shared/extension-pack";
 import { NotificationLogger, showAndLogErrorMessage } from "../common/logging";

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

@@ -3,7 +3,7 @@ import { glob } from "glob";
 import { basename } from "path";
 import { load } from "js-yaml";
 import { readFile } from "fs-extra";
-import { getQlPackPath } from "../pure/ql";
+import { getQlPackPath } from "../common/ql";
 import { CodeQLCliServer, QlpacksInfo } from "../codeql-cli/cli";
 import { extLogger } from "../common/logging/vscode";
 import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";

extensions/ql-vscode/src/databases/qlpack.ts

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

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

@@ -13,7 +13,7 @@ import {
   UserCancellationException,
 } from "../common/vscode/progress";
 import { getErrorMessage } from "../common/helpers-pure";
-import { FALLBACK_QLPACK_FILENAME, getQlPackPath } from "../pure/ql";
+import { FALLBACK_QLPACK_FILENAME, getQlPackPath } from "../common/ql";
 import { App } from "../common/app";
 
 const QUICK_QUERIES_DIR_NAME = "quick-queries";

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

@@ -2,7 +2,7 @@ import { basename, dirname } from "path";
 import { CodeQLCliServer, QuerySetup } from "../codeql-cli/cli";
 import { Event } from "vscode";
 import { QueryLanguage, dbSchemeToLanguage } from "../common/query-language";
-import { FALLBACK_QLPACK_FILENAME, QLPACK_FILENAMES } from "../pure/ql";
+import { FALLBACK_QLPACK_FILENAME, QLPACK_FILENAMES } from "../common/ql";
 import { FilePathDiscovery } from "../common/vscode/file-path-discovery";
 import { getErrorMessage } from "../common/helpers-pure";
 import { extLogger } from "../common/logging/vscode";

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

@@ -33,7 +33,7 @@ import {
   FALLBACK_QLPACK_FILENAME,
   QLPACK_FILENAMES,
   QLPACK_LOCK_FILENAMES,
-} from "../pure/ql";
+} from "../common/ql";
 import { QueryLanguage } from "../common/query-language";
 import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";
 import { askForLanguage, findLanguage } from "../codeql-cli/query-language";

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

@@ -2,7 +2,7 @@ import { join } from "path";
 import { dirSync } from "tmp-promise";
 import { DirResult } from "tmp";
 import { writeFile } from "fs-extra";
-import { getQlPackPath } from "../../../src/pure/ql";
+import { getQlPackPath } from "../../../src/common/ql";
 
 describe("getQlPackPath", () => {
   let tmpDir: DirResult;