From f0f5538b51026af9d5b3f554c0c1f8bb80de78ed Mon Sep 17 00:00:00 2001
From: Koen Vlaswinkel <koesie10@github.com>
Date: Wed, 25 Oct 2023 14:37:06 +0200
Subject: [PATCH] Remove check for isFolderAlreadyInWorkspace

---
 .../src/local-queries/skeleton-query-wizard.ts        | 11 ++++-------
 .../local-queries/skeleton-query-wizard.test.ts       | 10 ----------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts b/extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts
index 724bf3d24..ade942f91 100644
--- a/extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts
+++ b/extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts
@@ -4,10 +4,7 @@ import { CodeQLCliServer } from "../codeql-cli/cli";
 import { BaseLogger } from "../common/logging";
 import { Credentials } from "../common/authentication";
 import { QueryLanguage } from "../common/query-language";
-import {
-  getFirstWorkspaceFolder,
-  isFolderAlreadyInWorkspace,
-} from "../common/vscode/workspace-folders";
+import { getFirstWorkspaceFolder } from "../common/vscode/workspace-folders";
 import { getErrorMessage } from "../common/helpers-pure";
 import { QlPackGenerator } from "./qlpack-generator";
 import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
@@ -72,9 +69,9 @@ export class SkeletonQueryWizard {
 
     this.qlPackStoragePath = await this.determineStoragePath();
 
-    const skeletonPackAlreadyExists =
-      (await pathExists(join(this.qlPackStoragePath, this.folderName))) ||
-      isFolderAlreadyInWorkspace(this.folderName);
+    const skeletonPackAlreadyExists = await pathExists(
+      join(this.qlPackStoragePath, this.folderName),
+    );
 
     if (skeletonPackAlreadyExists) {
       // just create a new example query file in skeleton QL pack
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts
index d97e75798..9526e61cd 100644
--- a/extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts
@@ -8,7 +8,6 @@ import * as tmp from "tmp";
 import { TextDocument, window, workspace, WorkspaceFolder } from "vscode";
 import { extLogger } from "../../../../src/common/logging/vscode";
 import { QlPackGenerator } from "../../../../src/local-queries/qlpack-generator";
-import * as workspaceFolders from "../../../../src/common/vscode/workspace-folders";
 import {
   createFileSync,
   ensureDir,
@@ -171,11 +170,6 @@ describe("SkeletonQueryWizard", () => {
   });
 
   describe("if QL pack doesn't exist", () => {
-    beforeEach(() => {
-      jest
-        .spyOn(workspaceFolders, "isFolderAlreadyInWorkspace")
-        .mockReturnValue(false);
-    });
     it("should try to create a new QL pack based on the language", async () => {
       await wizard.execute();
 
@@ -201,10 +195,6 @@ describe("SkeletonQueryWizard", () => {
 
   describe("if QL pack exists", () => {
     beforeEach(async () => {
-      jest
-        .spyOn(workspaceFolders, "isFolderAlreadyInWorkspace")
-        .mockReturnValue(true);
-
       // create a skeleton codeql-custom-queries-${language} folder
       // with an example QL file inside
       ensureDirSync(