Remove check for isFolderAlreadyInWorkspace
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user