development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-13 23:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Safer change for #25422

Browse source
This commit is contained in:
Rob Lourens 2017-05-25 16:27:55 -07:00
parent 867468a559
commit ce18dd018d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
View file

@ -235,7 +235,7 @@ export class RipgrepParser extends EventEmitter {
this.onResult();
}
this.fileMatch = new FileMatch(path.resolve(this.rootFolder, r[1]));
this.fileMatch = new FileMatch(path.isAbsolute(r[1]) ? r[1] : path.join(this.rootFolder, r[1]));
} else {
// Line is empty (or malformed)
}

2
src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts
View file

@ -74,7 +74,7 @@ suite('RipgrepParser', () => {
assert.deepEqual(results[0],
<ISerializedFileMatch>{
numMatches: 2,
path: path.resolve(rootFolder, 'a.txt'),
path: path.join(rootFolder, 'a.txt'),
lineMatches: [
{
lineNumber: 0,