Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

EH search - fix file paths on windows

Browse Source
This commit is contained in:
Rob Lourens
2018-05-11 22:31:25 -07:00
parent 3bc1b42ad7
commit 93dc156ad3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/api/node/extHostSearch.ts
View File

@@ -422,7 +422,7 @@ class FileSearchEngine {
let cancellation = new CancellationTokenSource();
return new PPromise((resolve, reject, onResult) => {
const options = this.getSearchOptionsForFolder(fq);
const folderStr = fq.folder.toString();
const folderStr = fq.folder.fsPath;
let filePatternSeen = false;
const tree = this.initDirectoryTree();
@@ -433,7 +433,7 @@ class FileSearchEngine {
// TODO@roblou - What if it is not relative to the folder query.
// This is slow...
const relativePath = path.relative(folderStr, result.toString());
const relativePath = path.relative(folderStr, result.fsPath);
if (noSiblingsClauses) {
if (relativePath === this.filePattern) {
@@ -792,7 +792,7 @@ class FileSearchManager {
private rawMatchToSearchItem(match: IInternalFileMatch): IFileMatch {
return {
resource: URI.parse(match.base ? path.join(match.base, match.relativePath) : match.relativePath)
resource: URI.file(match.base ? path.join(match.base, match.relativePath) : match.relativePath)
};
}