Merge pull request #2367 from github/nora/move-local-query-files

Move local query files

Author: norascheuch

extensions/ql-vscode/src/extension.ts

@@ -26,7 +26,6 @@ import {
   activate as archiveFilesystemProvider_activate,
   zipArchiveScheme,
 } from "./archive-filesystem-provider";
-import QuickEvalCodeLensProvider from "./quickEvalCodeLensProvider";
 import { CodeQLCliServer } from "./cli";
 import {
   CliConfigListener,
@@ -119,7 +118,7 @@ import {
   PreActivationCommands,
   QueryServerCommands,
 } from "./common/commands";
-import { LocalQueries } from "./local-queries";
+import { LocalQueries, QuickEvalCodeLensProvider } from "./local-queries";
 import { getAstCfgCommands } from "./ast-cfg-commands";
 import { App } from "./common/app";
 import { registerCommandWithErrorHandling } from "./common/vscode/commands";

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

@@ -1,2 +1,4 @@
 export * from "./local-queries";
 export * from "./local-query-run";
+export * from "./quick-eval-code-lens-provider";
+export * from "./quick-query";

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

@@ -20,7 +20,7 @@ import {
   showAndLogWarningMessage,
   showBinaryChoiceDialog,
 } from "../helpers";
-import { displayQuickQuery } from "../quick-query";
+import { displayQuickQuery } from "./quick-query";
 import { CoreCompletedQuery, QueryRunner } from "../query-server";
 import { QueryHistoryManager } from "../query-history/query-history-manager";
 import { DatabaseUI } from "../local-databases-ui";

…-vscode/src/quickEvalCodeLensProvider.ts …queries/quick-eval-code-lens-provider.tsextensions/ql-vscode/src/quickEvalCodeLensProvider.ts renamed to extensions/ql-vscode/src/local-queries/quick-eval-code-lens-provider.ts extensions/ql-vscode/src/quickEvalCodeLensProvider.ts renamed to extensions/ql-vscode/src/local-queries/quick-eval-code-lens-provider.ts

@@ -5,9 +5,9 @@ import {
   Command,
   Range,
 } from "vscode";
-import { isQuickEvalCodelensEnabled } from "./config";
+import { isQuickEvalCodelensEnabled } from "../config";
 
-class QuickEvalCodeLensProvider implements CodeLensProvider {
+export class QuickEvalCodeLensProvider implements CodeLensProvider {
   async provideCodeLenses(document: TextDocument): Promise<CodeLens[]> {
     const codeLenses: CodeLens[] = [];
 
@@ -43,5 +43,3 @@ class QuickEvalCodeLensProvider implements CodeLensProvider {
     return codeLenses;
   }
 }
-
-export default QuickEvalCodeLensProvider;

extensions/ql-vscode/src/quick-query.ts …-vscode/src/local-queries/quick-query.tsextensions/ql-vscode/src/quick-query.ts renamed to extensions/ql-vscode/src/local-queries/quick-query.ts extensions/ql-vscode/src/quick-query.ts renamed to extensions/ql-vscode/src/local-queries/quick-query.ts

@@ -3,18 +3,18 @@ import { dump, load } from "js-yaml";
 import { basename, join } from "path";
 import { CancellationToken, window as Window, workspace, Uri } from "vscode";
 import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
-import { CodeQLCliServer } from "./cli";
-import { DatabaseUI } from "./local-databases-ui";
+import { CodeQLCliServer } from "../cli";
+import { DatabaseUI } from "../local-databases-ui";
 import {
   getInitialQueryContents,
   getPrimaryDbscheme,
   getQlPackForDbscheme,
   showBinaryChoiceDialog,
-} from "./helpers";
-import { ProgressCallback, UserCancellationException } from "./progress";
-import { getErrorMessage } from "./pure/helpers-pure";
-import { FALLBACK_QLPACK_FILENAME, getQlPackPath } from "./pure/ql";
-import { App } from "./common/app";
+} from "../helpers";
+import { ProgressCallback, UserCancellationException } from "../progress";
+import { getErrorMessage } from "../pure/helpers-pure";
+import { FALLBACK_QLPACK_FILENAME, getQlPackPath } from "../pure/ql";
+import { App } from "../common/app";
 
 const QUICK_QUERIES_DIR_NAME = "quick-queries";
 const QUICK_QUERY_QUERY_NAME = "quick-query.ql";

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

@@ -21,7 +21,7 @@ import {
   readdir,
 } from "fs-extra";
 import { ensureMetadataIsComplete, InitialQueryInfo } from "./query-results";
-import { isQuickQueryPath } from "./quick-query";
+import { isQuickQueryPath } from "./local-queries";
 import { nanoid } from "nanoid";
 import { CodeQLCliServer } from "./cli";
 import { SELECT_QUERY_NAME } from "./contextual/locationFinder";