mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove check for isFolderAlreadyInWorkspace

Browse Source
This commit is contained in:
Koen Vlaswinkel
2023-10-25 14:37:06 +02:00
parent a3fad49577
commit f0f5538b51
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,10 +4,7 @@ import { CodeQLCliServer } from "../codeql-cli/cli";
import { BaseLogger } from "../common/logging"; import { BaseLogger } from "../common/logging";
import { Credentials } from "../common/authentication"; import { Credentials } from "../common/authentication";
import { QueryLanguage } from "../common/query-language"; import { QueryLanguage } from "../common/query-language";
import { import { getFirstWorkspaceFolder } from "../common/vscode/workspace-folders";
getFirstWorkspaceFolder,
isFolderAlreadyInWorkspace,
} from "../common/vscode/workspace-folders";
import { getErrorMessage } from "../common/helpers-pure"; import { getErrorMessage } from "../common/helpers-pure";
import { QlPackGenerator } from "./qlpack-generator"; import { QlPackGenerator } from "./qlpack-generator";
import { DatabaseItem, DatabaseManager } from "../databases/local-databases"; import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
@@ -72,9 +69,9 @@ export class SkeletonQueryWizard {
this.qlPackStoragePath = await this.determineStoragePath(); this.qlPackStoragePath = await this.determineStoragePath();
const skeletonPackAlreadyExists = const skeletonPackAlreadyExists = await pathExists(
(await pathExists(join(this.qlPackStoragePath, this.folderName))) || join(this.qlPackStoragePath, this.folderName),
isFolderAlreadyInWorkspace(this.folderName); );
if (skeletonPackAlreadyExists) { if (skeletonPackAlreadyExists) {
// just create a new example query file in skeleton QL pack // just create a new example query file in skeleton QL pack

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

@@ -8,7 +8,6 @@ import * as tmp from "tmp";
import { TextDocument, window, workspace, WorkspaceFolder } from "vscode"; import { TextDocument, window, workspace, WorkspaceFolder } from "vscode";
import { extLogger } from "../../../../src/common/logging/vscode"; import { extLogger } from "../../../../src/common/logging/vscode";
import { QlPackGenerator } from "../../../../src/local-queries/qlpack-generator"; import { QlPackGenerator } from "../../../../src/local-queries/qlpack-generator";
import * as workspaceFolders from "../../../../src/common/vscode/workspace-folders";
import { import {
createFileSync, createFileSync,
ensureDir, ensureDir,
@@ -171,11 +170,6 @@ describe("SkeletonQueryWizard", () => {
}); });
describe("if QL pack doesn't exist", () => { 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 () => { it("should try to create a new QL pack based on the language", async () => {
await wizard.execute(); await wizard.execute();
@@ -201,10 +195,6 @@ describe("SkeletonQueryWizard", () => {
describe("if QL pack exists", () => { describe("if QL pack exists", () => {
beforeEach(async () => { beforeEach(async () => {
jest
.spyOn(workspaceFolders, "isFolderAlreadyInWorkspace")
.mockReturnValue(true);
// create a skeleton codeql-custom-queries-${language} folder // create a skeleton codeql-custom-queries-${language} folder
// with an example QL file inside // with an example QL file inside
ensureDirSync( ensureDirSync(