Merge branch 'main' into robertbrignull/handleCompareWith

uick 6363a6a Remove the determineSelection method

Author: robertbrignull

extensions/ql-vscode/package.json

@@ -1419,7 +1419,7 @@
         },
         {
           "command": "codeQL.createQuery",
-          "when": "config.codeQL.canary"
+          "when": "config.codeQL.codespacesTemplate"
         },
         {
           "command": "codeQLTests.acceptOutputContextTestItem",

extensions/ql-vscode/src/ast-cfg-commands.ts

@@ -6,7 +6,7 @@ import {
   TemplatePrintCfgProvider,
 } from "./contextual/templateProvider";
 import { AstCfgCommands } from "./common/commands";
-import { LocalQueries } from "./local-queries/local-queries";
+import { LocalQueries } from "./local-queries";
 
 type AstCfgOptions = {
   localQueries: LocalQueries;

extensions/ql-vscode/src/contextual/locationFinder.ts

@@ -20,7 +20,7 @@ import {
 } from "./queryResolver";
 import { CancellationToken, LocationLink, Uri } from "vscode";
 import { QueryOutputDir } from "../run-queries-shared";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server";
 import { QueryResultType } from "../pure/new-messages";
 
 export const SELECT_QUERY_NAME = "#select";

extensions/ql-vscode/src/contextual/queryResolver.ts

@@ -16,7 +16,7 @@ import { DatabaseItem } from "../local-databases";
 import { extLogger, TeeLogger } from "../common";
 import { CancellationToken } from "vscode";
 import { ProgressCallback } from "../progress";
-import { CoreCompletedQuery, QueryRunner } from "../queryRunner";
+import { CoreCompletedQuery, QueryRunner } from "../query-server";
 import { redactableError } from "../pure/errors";
 import { QLPACK_FILENAMES } from "../pure/ql";
 

extensions/ql-vscode/src/contextual/templateProvider.ts

@@ -32,7 +32,7 @@ import {
   runContextualQuery,
 } from "./queryResolver";
 import { isCanary, NO_CACHE_AST_VIEWER } from "../config";
-import { CoreCompletedQuery, QueryRunner } from "../queryRunner";
+import { CoreCompletedQuery, QueryRunner } from "../query-server";
 
 /**
  * Runs templated CodeQL queries to find definitions in

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

@@ -2,7 +2,7 @@ import { ExtensionContext } from "vscode";
 import { DataExtensionsEditorView } from "./data-extensions-editor-view";
 import { DataExtensionsEditorCommands } from "../common/commands";
 import { CliVersionConstraint, CodeQLCliServer } from "../cli";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server";
 import { DatabaseManager } from "../local-databases";
 import { ensureDir } from "fs-extra";
 import { join } from "path";

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

@@ -13,7 +13,7 @@ import {
   ToDataExtensionsEditorMessage,
 } from "../pure/interface-types";
 import { ProgressUpdate } from "../progress";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server";
 import {
   showAndLogErrorMessage,
   showAndLogExceptionWithTelemetry,

extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts

@@ -1,4 +1,4 @@
-import { CoreCompletedQuery, QueryRunner } from "../queryRunner";
+import { CoreCompletedQuery, QueryRunner } from "../query-server";
 import { dir } from "tmp-promise";
 import { writeFile } from "fs-extra";
 import { dump as dumpYaml } from "js-yaml";

extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts

@@ -1,7 +1,7 @@
 import { CancellationToken } from "vscode";
 import { DatabaseItem } from "../local-databases";
 import { join } from "path";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server";
 import { CodeQLCliServer } from "../cli";
 import { TeeLogger } from "../common";
 import { extensiblePredicateDefinitions } from "./predicates";

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

@@ -5,7 +5,7 @@ import {
   WorkspaceFolder,
 } from "vscode";
 import { getOnDiskWorkspaceFolders, showAndLogErrorMessage } from "../helpers";
-import { LocalQueries } from "../local-queries/local-queries";
+import { LocalQueries } from "../local-queries";
 import { getQuickEvalContext, validateQueryPath } from "../run-queries-shared";
 import * as CodeQLProtocol from "./debug-protocol";
 import { getErrorMessage } from "../pure/helpers-pure";

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

@@ -14,7 +14,7 @@ import { Disposable } from "vscode";
 import { CancellationTokenSource } from "vscode-jsonrpc";
 import { BaseLogger, LogOptions, queryServerLogger } from "../common";
 import { QueryResultType } from "../pure/new-messages";
-import { CoreQueryResults, CoreQueryRun, QueryRunner } from "../queryRunner";
+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";

extensions/ql-vscode/src/debugger/debugger-factory.ts

@@ -9,9 +9,9 @@ import {
   ProviderResult,
 } from "vscode";
 import { isCanary } from "../config";
-import { LocalQueries } from "../local-queries/local-queries";
+import { LocalQueries } from "../local-queries";
 import { DisposableObject } from "../pure/disposable-object";
-import { QueryRunner } from "../queryRunner";
+import { QueryRunner } from "../query-server";
 import { QLDebugConfigurationProvider } from "./debug-configuration";
 import { QLDebugSession } from "./debug-session";
 

extensions/ql-vscode/src/debugger/debugger-ui.ts

@@ -9,9 +9,8 @@ import {
 } from "vscode";
 import { DebuggerCommands } from "../common/commands";
 import { DatabaseManager } from "../local-databases";
-import { LocalQueries } from "../local-queries/local-queries";
 import { DisposableObject } from "../pure/disposable-object";
-import { CoreQueryResults } from "../queryRunner";
+import { CoreQueryResults } from "../query-server";
 import {
   getQuickEvalContext,
   QueryOutputDir,
@@ -20,7 +19,7 @@ import {
 import { QLResolvedDebugConfiguration } from "./debug-configuration";
 import * as CodeQLProtocol from "./debug-protocol";
 import { App } from "../common/app";
-import { LocalQueryRun } from "../local-queries/local-query-run";
+import { LocalQueryRun, LocalQueries } from "../local-queries";
 
 /**
  * Listens to messages passing between VS Code and the debug adapter, so that we can supplement the

extensions/ql-vscode/src/extension.ts

@@ -83,8 +83,10 @@ import {
 } from "./common";
 import { QueryHistoryManager } from "./query-history/query-history-manager";
 import { CompletedLocalQueryInfo } from "./query-results";
-import { QueryServerClient as LegacyQueryServerClient } from "./legacy-query-server/queryserver-client";
-import { QueryServerClient } from "./query-server/queryserver-client";
+import {
+  LegacyQueryRunner,
+  QueryServerClient as LegacyQueryServerClient,
+} from "./query-server/legacy";
 import { QLTestAdapterFactory } from "./test-adapter";
 import { TestUIService } from "./test-ui";
 import { CompareView } from "./compare/compare-view";
@@ -97,9 +99,6 @@ import { EvalLogViewer } from "./eval-log-viewer";
 import { SummaryLanguageSupport } from "./log-insights/summary-language-support";
 import { JoinOrderScannerProvider } from "./log-insights/join-order";
 import { LogScannerService } from "./log-insights/log-scanner-service";
-import { LegacyQueryRunner } from "./legacy-query-server/legacyRunner";
-import { NewQueryRunner } from "./query-server/query-runner";
-import { QueryRunner } from "./queryRunner";
 import { VariantAnalysisView } from "./variant-analysis/variant-analysis-view";
 import { VariantAnalysisViewSerializer } from "./variant-analysis/variant-analysis-view-serializer";
 import { VariantAnalysisManager } from "./variant-analysis/variant-analysis-manager";
@@ -117,7 +116,7 @@ import {
   PreActivationCommands,
   QueryServerCommands,
 } from "./common/commands";
-import { LocalQueries } from "./local-queries/local-queries";
+import { LocalQueries } from "./local-queries";
 import { getAstCfgCommands } from "./ast-cfg-commands";
 import { getQueryEditorCommands } from "./query-editor";
 import { App } from "./common/app";
@@ -127,6 +126,7 @@ import { DataExtensionsEditorModule } from "./data-extensions-editor/data-extens
 import { TestManager } from "./test-manager";
 import { TestRunner } from "./test-runner";
 import { TestManagerBase } from "./test-manager-base";
+import { NewQueryRunner, QueryRunner, QueryServerClient } from "./query-server";
 
 /**
  * extension.ts
@@ -707,9 +707,14 @@ async function activateWithInstalledDistribution(
   for (const glob of PACK_GLOBS) {
     const fsWatcher = workspace.createFileSystemWatcher(glob);
     ctx.subscriptions.push(fsWatcher);
-    fsWatcher.onDidChange(async (_uri) => {
+
+    const clearPackCache = async (_uri: Uri) => {
       await qs.clearPackCache();
-    });
+    };
+
+    fsWatcher.onDidCreate(clearPackCache);
+    fsWatcher.onDidChange(clearPackCache);
+    fsWatcher.onDidDelete(clearPackCache);
   }
 
   void extLogger.log("Initializing database manager.");

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

@@ -41,7 +41,7 @@ import {
   promptImportInternetDatabase,
 } from "./databaseFetcher";
 import { asError, asyncFilter, getErrorMessage } from "./pure/helpers-pure";
-import { QueryRunner } from "./queryRunner";
+import { QueryRunner } from "./query-server";
 import { isCanary } from "./config";
 import { App } from "./common/app";
 import { redactableError } from "./pure/errors";

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

@@ -23,7 +23,7 @@ import {
 import { DisposableObject } from "./pure/disposable-object";
 import { Logger, extLogger } from "./common";
 import { asError, getErrorMessage } from "./pure/helpers-pure";
-import { QueryRunner } from "./queryRunner";
+import { QueryRunner } from "./query-server";
 import { pathsEqual } from "./pure/files";
 import { redactableError } from "./pure/errors";
 import { isCodespacesTemplate } from "./config";

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

@@ -0,0 +1,2 @@
+export * from "./local-queries";
+export * from "./local-query-run";

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

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

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

@@ -4,7 +4,7 @@ import {
   showAndLogWarningMessage,
   tryGetQueryMetadata,
 } from "../helpers";
-import { CoreQueryResults } from "../queryRunner";
+import { CoreQueryResults } from "../query-server";
 import { QueryHistoryManager } from "../query-history/query-history-manager";
 import { DatabaseItem } from "../local-databases";
 import {

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

@@ -1,6 +1,6 @@
 import { Uri, window } from "vscode";
 import { CodeQLCliServer } from "./cli";
-import { QueryRunner } from "./queryRunner";
+import { QueryRunner } from "./query-server";
 import { basename, join } from "path";
 import { getErrorMessage } from "./pure/helpers-pure";
 import { redactableError } from "./pure/errors";