Merge branch 'main' into robertbrignull/JumpToUsageMessage

Author: robertbrignull

extensions/ql-vscode/CHANGELOG.md

@@ -7,6 +7,7 @@
 - Increase the required version of VS Code to 1.82.0. [#2877](https://github.com/github/vscode-codeql/pull/2877)
 - Fix a bug where the query server was restarted twice after configuration changes. [#2884](https://github.com/github/vscode-codeql/pull/2884).
 - Add support for the `telemetry.telemetryLevel` setting. For more information, see the [telemetry documentation](https://codeql.github.com/docs/codeql-for-visual-studio-code/about-telemetry-in-codeql-for-visual-studio-code). [#2824](https://github.com/github/vscode-codeql/pull/2824).
+- Fix syntax highlighting directly after import statements with instantiation arguments. [#2792](https://github.com/github/vscode-codeql/pull/2792)
 
 ## 1.9.1 - 29 September 2023
 

extensions/ql-vscode/package.json

@@ -110,6 +110,10 @@
                   "string"
                 ],
                 "description": "Names of extension packs to include in the evaluation. These are resolved from the locations specified in `additionalPacks`."
+              },
+              "additionalRunQueryArgs": {
+                "type": "object",
+                "description": "**Internal use only**. Additional arguments to pass to the `runQuery` command of the query server, without validation."
               }
             }
           }

extensions/ql-vscode/src/common/interface-types.ts

@@ -555,8 +555,7 @@ interface GenerateMethodMessage {
 interface GenerateMethodsFromLlmMessage {
   t: "generateMethodsFromLlm";
   packageName: string;
-  methods: Method[];
-  modeledMethods: Record<string, ModeledMethod>;
+  methodSignatures: string[];
 }
 
 interface StopGeneratingMethodsFromLlmMessage {
@@ -633,7 +632,7 @@ interface SetMethodModelingPanelViewStateMessage {
 
 interface SetMethodMessage {
   t: "setMethod";
-  method: Method;
+  method: Method | undefined;
 }
 
 interface SetMethodModifiedMessage {

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

@@ -22,6 +22,7 @@ export interface QLDebugArgs {
   extensionPacks?: string[] | string;
   quickEval?: boolean;
   noDebug?: boolean;
+  additionalRunQueryArgs?: Record<string, any>;
 }
 
 /**
@@ -120,6 +121,7 @@ export class QLDebugConfigurationProvider
         extensionPacks,
         quickEvalContext,
         noDebug: qlConfiguration.noDebug ?? false,
+        additionalRunQueryArgs: qlConfiguration.additionalRunQueryArgs ?? {},
       };
 
       return resultConfiguration;

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

@@ -70,6 +70,8 @@ export interface LaunchConfig {
   quickEvalContext: QuickEvalContext | undefined;
   /** Run the query without debugging it. */
   noDebug: boolean;
+  /** Undocumented: Additional arguments to be passed to the `runQuery` API on the query server. */
+  additionalRunQueryArgs: Record<string, any>;
 }
 
 export interface LaunchRequest extends Request, DebugProtocol.LaunchRequest {

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

@@ -161,6 +161,7 @@ class RunningQuery extends DisposableObject {
       true,
       config.additionalPacks,
       config.extensionPacks,
+      config.additionalRunQueryArgs,
       queryStorageDir,
       undefined,
       undefined,

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

@@ -44,6 +44,7 @@ export async function runContextualQuery(
     false,
     getOnDiskWorkspaceFolders(),
     undefined,
+    {},
     queryStorageDir,
     undefined,
     templates,

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

@@ -456,6 +456,7 @@ export class LocalQueries extends DisposableObject {
       true,
       additionalPacks,
       extensionPacks,
+      {},
       this.queryStorageDir,
       undefined,
       templates,

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

@@ -41,6 +41,7 @@ export async function runQuery({
     false,
     additionalPacks,
     extensionPacks,
+    {},
     queryStorageDir,
     undefined,
     undefined,

extensions/ql-vscode/src/model-editor/auto-model.ts

@@ -14,13 +14,13 @@ import { groupMethods, sortGroupNames, sortMethods } from "./shared/sorting";
  * the order in the UI.
  * @param mode Whether it is application or framework mode.
  * @param methods all methods.
- * @param modeledMethods the currently modeled methods.
+ * @param modeledMethodsBySignature the currently modeled methods.
  * @returns list of modeled methods that are candidates for modeling.
  */
 export function getCandidates(
   mode: Mode,
   methods: Method[],
-  modeledMethods: Record<string, ModeledMethod>,
+  modeledMethodsBySignature: Record<string, ModeledMethod[]>,
 ): MethodSignature[] {
   // Sort the same way as the UI so we send the first ones listed in the UI first
   const grouped = groupMethods(methods, mode);
@@ -32,12 +32,11 @@ export function getCandidates(
   const candidates: MethodSignature[] = [];
 
   for (const method of sortedMethods) {
-    const modeledMethod: ModeledMethod = modeledMethods[method.signature] ?? {
-      type: "none",
-    };
+    const modeledMethods: ModeledMethod[] =
+      modeledMethodsBySignature[method.signature] ?? [];
 
     // Anything that is modeled is not a candidate
-    if (modeledMethod.type !== "none") {
+    if (modeledMethods.some((m) => m.type !== "none")) {
       continue;
     }