microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-08 23:32:36 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Fix #24897 - Pool instead of queue result handling promises -

Browse Source 
Queuing a large number of WinJS promises that aren't actually async can lead to a stack overflow. Also this is faster.
This commit is contained in:
Rob Lourens
2017-04-17 15:02:29 -07:00
parent 7300527f44
commit 4090184241
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
View File

@@ -26,7 +26,7 @@ export class RipgrepEngine {
private ripgrepParser: RipgrepParser;
private handleResultP: TPromise<any> = TPromise.wrap(null);
private resultsHandledP: TPromise<any> = TPromise.wrap(null);
constructor(private config: IRawSearch) {
}
@@ -66,13 +66,14 @@ export class RipgrepEngine {
this.ripgrepParser.on('result', (match: ISerializedFileMatch) => {
if (this.postProcessExclusions) {
const relativePath = path.relative(rootFolder, match.path);
this.handleResultP = this.handleResultP
.then(() => (<TPromise<string>>this.postProcessExclusions(relativePath, undefined, () => getSiblings(match.path))))
const handleResultP = (<TPromise<string>>this.postProcessExclusions(relativePath, undefined, () => getSiblings(match.path)))
.then(globMatch => {
if (!globMatch) {
onResult(match);
}
});
this.resultsHandledP = TPromise.join([this.resultsHandledP, handleResultP]);
} else {
onResult(match);
}
@@ -102,7 +103,7 @@ export class RipgrepEngine {
this.rgProc.on('close', code => {
// Trigger last result, then wait on async result handling
this.ripgrepParser.flush();
this.handleResultP.then(() => {
this.resultsHandledP.then(() => {
this.rgProc = null;
if (!this.isDone) {
this.isDone = true;