Skip to content

Commit f0f5538

Browse files
committed
Remove check for isFolderAlreadyInWorkspace
1 parent a3fad49 commit f0f5538

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ import { CodeQLCliServer } from "../codeql-cli/cli";
44
import { BaseLogger } from "../common/logging";
55
import { Credentials } from "../common/authentication";
66
import { QueryLanguage } from "../common/query-language";
7-
import {
8-
getFirstWorkspaceFolder,
9-
isFolderAlreadyInWorkspace,
10-
} from "../common/vscode/workspace-folders";
7+
import { getFirstWorkspaceFolder } from "../common/vscode/workspace-folders";
118
import { getErrorMessage } from "../common/helpers-pure";
129
import { QlPackGenerator } from "./qlpack-generator";
1310
import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
@@ -72,9 +69,9 @@ export class SkeletonQueryWizard {
7269

7370
this.qlPackStoragePath = await this.determineStoragePath();
7471

75-
const skeletonPackAlreadyExists =
76-
(await pathExists(join(this.qlPackStoragePath, this.folderName))) ||
77-
isFolderAlreadyInWorkspace(this.folderName);
72+
const skeletonPackAlreadyExists = await pathExists(
73+
join(this.qlPackStoragePath, this.folderName),
74+
);
7875

7976
if (skeletonPackAlreadyExists) {
8077
// just create a new example query file in skeleton QL pack

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import * as tmp from "tmp";
88
import { TextDocument, window, workspace, WorkspaceFolder } from "vscode";
99
import { extLogger } from "../../../../src/common/logging/vscode";
1010
import { QlPackGenerator } from "../../../../src/local-queries/qlpack-generator";
11-
import * as workspaceFolders from "../../../../src/common/vscode/workspace-folders";
1211
import {
1312
createFileSync,
1413
ensureDir,
@@ -171,11 +170,6 @@ describe("SkeletonQueryWizard", () => {
171170
});
172171

173172
describe("if QL pack doesn't exist", () => {
174-
beforeEach(() => {
175-
jest
176-
.spyOn(workspaceFolders, "isFolderAlreadyInWorkspace")
177-
.mockReturnValue(false);
178-
});
179173
it("should try to create a new QL pack based on the language", async () => {
180174
await wizard.execute();
181175

@@ -201,10 +195,6 @@ describe("SkeletonQueryWizard", () => {
201195

202196
describe("if QL pack exists", () => {
203197
beforeEach(async () => {
204-
jest
205-
.spyOn(workspaceFolders, "isFolderAlreadyInWorkspace")
206-
.mockReturnValue(true);
207-
208198
// create a skeleton codeql-custom-queries-${language} folder
209199
// with an example QL file inside
210200
ensureDirSync(

0 commit comments

Comments
 (0)