Merge branch 'main' into starcke/rename-directories

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

@@ -128,7 +128,7 @@ async function resolveAutomodelQuery(
   queryTag: string,
   mode: Mode,
 ): Promise<string> {
-  const packsToSearch = [`codeql/${databaseItem.language}-queries`];
+  const packsToSearch = [`codeql/${databaseItem.language}-automodel-queries`];
 
   // First, resolve the query that we want to run.
   // All queries are tagged like this:
@@ -178,7 +178,7 @@ export async function generateCandidateFilterPack(
     version: "0.0.0",
     library: true,
     extensionTargets: {
-      [`codeql/${language}-queries`]: "*",
+      [`codeql/${language}-automodel-queries`]: "*",
     },
     dataExtensions: ["filter.yml"],
   };
@@ -199,7 +199,7 @@ export async function generateCandidateFilterPack(
     extensions: [
       {
         addsTo: {
-          pack: `codeql/${language}-queries`,
+          pack: `codeql/${language}-automodel-queries`,
           extensible: "automodelCandidateFilter",
         },
         data: dataRows,

extensions/ql-vscode/src/model-editor/data-extensions-editor-queries.ts

@@ -40,6 +40,7 @@ export async function setUpPack(
 
   // Install the other needed query packs
   await cliServer.packDownload([`codeql/${language}-queries`]);
+  await cliServer.packDownload([`codeql/${language}-automodel-queries`]);
 
   return true;
 }

extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/auto-model-codeml-queries.test.ts

@@ -140,7 +140,7 @@ describe("runAutoModelQueries", () => {
     expect(resolveQueriesSpy).toHaveBeenCalledTimes(1);
     expect(resolveQueriesSpy).toHaveBeenCalledWith(
       options.cliServer,
-      ["codeql/java-queries"],
+      ["codeql/java-automodel-queries"],
       "Extract automodel candidates",
       {
         kind: "problem",
@@ -188,7 +188,7 @@ describe("generateCandidateFilterPack", () => {
     expect(extensions).toBeInstanceOf(Array);
     expect(extensions).toHaveLength(1);
     const extension = extensions[0];
-    expect(extension.addsTo.pack).toEqual("codeql/java-queries");
+    expect(extension.addsTo.pack).toEqual("codeql/java-automodel-queries");
     expect(extension.addsTo.extensible).toEqual("automodelCandidateFilter");
     expect(extension.data).toBeInstanceOf(Array);
     expect(extension.data).toHaveLength(1);