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