Fix creation of nested query packs

Before, if you had selected a folder or file within for example
`codeql-custom-queries-java` and selected `java` as the language, it
would create a nested folder within `codeql-custom-queries-java` with
the name `codeql-custom-queries-java`. This is unexpected for the user,
who would expect a new query to be created within
`codeql-custom-queries-java`. This fixes that by checking for this
specific condition. It does not fix it for all scenarios, such as where
the selected file/folder is nested multiple levels deep within the
`codeql-custom-queries-java` folder.

Author: koesie10

extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts

@@ -1,4 +1,4 @@
-import { dirname, join } from "path";
+import { basename, dirname, join } from "path";
 import { Uri, window as Window, workspace } from "vscode";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { BaseLogger } from "../common/logging";
@@ -116,6 +116,18 @@ export class SkeletonQueryWizard {
       return this.determineRootStoragePath();
     }
 
+    const storagePath = await this.determineStoragePathFromSelection();
+
+    // If the user has selected a folder or file within a folder that matches the current
+    // folder name, we should create a query rather than a query pack
+    if (basename(storagePath) === this.folderName) {
+      return dirname(storagePath);
+    }
+
+    return storagePath;
+  }
+
+  private async determineStoragePathFromSelection(): Promise<string> {
     // Just like VS Code's "New File" command, if the user has selected multiple files/folders in the queries panel,
     // we will create the new file in the same folder as the first selected item.
     // See https://github.com/microsoft/vscode/blob/a8b7239d0311d4915b57c837972baf4b01394491/src/vs/workbench/contrib/files/browser/fileActions.ts#L893-L900
@@ -232,7 +244,7 @@ export class SkeletonQueryWizard {
       await qlPackGenerator.createExampleQlFile(this.fileName);
     } catch (e: unknown) {
       void this.logger.log(
-        `Could not create skeleton QL pack: ${getErrorMessage(e)}`,
+        `Could not create query example file: ${getErrorMessage(e)}`,
       );
     }
   }

extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts

@@ -442,6 +442,9 @@ describe("SkeletonQueryWizard", () => {
 
         await ensureDir(join(queriesDir.name, "folder"));
         await ensureFile(join(queriesDir.name, "queries-java", "example.ql"));
+        await ensureFile(
+          join(queriesDir.name, "codeql-custom-queries-swift", "example.ql"),
+        );
       });
 
       describe("with selected folder", () => {
@@ -510,6 +513,41 @@ describe("SkeletonQueryWizard", () => {
         });
       });
 
+      describe("with selected file with same name", () => {
+        let selectedItems: QueryTreeViewItem[];
+
+        beforeEach(async () => {
+          selectedItems = [
+            createQueryTreeFileItem(
+              "example.ql",
+              join(
+                queriesDir.name,
+                "codeql-custom-queries-swift",
+                "example.ql",
+              ),
+              "java",
+            ),
+          ];
+
+          wizard = new SkeletonQueryWizard(
+            mockCli,
+            jest.fn(),
+            credentials,
+            extLogger,
+            mockDatabaseManager,
+            storagePath,
+            selectedItems,
+            QueryLanguage.Swift,
+          );
+        });
+
+        it("returns the parent path", async () => {
+          const chosenPath = await wizard.determineStoragePath();
+
+          expect(chosenPath).toEqual(queriesDir.name);
+        });
+      });
+
       describe("with multiple selected items", () => {
         let selectedItems: QueryTreeViewItem[];