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

Fix "invalid characters" bug on Windows

Browse Source 
We now use `fsPath` instead of `path`.

Note: I haven't yet fixed the tests, nor checked manually on mac/linux

Tangential change: we now use the `dirname` method, instead of manually splitting paths to get a parent folder.
This commit is contained in:
shati-patel
2023-04-12 12:51:13 +01:00
parent 3087886400
commit 636be05f2b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/ql-vscode/src/skeleton-query-wizard.ts
View File

@@ -1,4 +1,4 @@
import { join } from "path";
import { join, dirname } from "path";
import { CancellationToken, Uri, workspace, window as Window } from "vscode";
import { CodeQLCliServer } from "./cli";
import { OutputChannelLogger } from "./common";
@@ -103,15 +103,11 @@ export class SkeletonQueryWizard {
// For the vscode-codeql-starter repo, the first folder will be a ql pack
// so we need to get the parent folder
if (firstFolder.uri.path.includes("codeql-custom-queries")) {
// slice off the last part of the path and return the parent folder
if (process.platform === "win32") {
return firstFolder.uri.path.split("\\").slice(0, -1).join("\\");
} else {
return firstFolder.uri.path.split("/").slice(0, -1).join("/");
}
// return the parent folder
return dirname(firstFolder.uri.fsPath);
} else {
// if the first folder is not a ql pack, then we are in a normal workspace
return firstFolder.uri.path;
return firstFolder.uri.fsPath;
}
}