Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into remove-ppromise

Browse Source
This commit is contained in:
Joao Moreno
2018-08-07 12:53:07 +02:00
parent 5cdfa0ccc0 7fd12f792f
commit 92f76db8cc
89 changed files with 919 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHostSearch.fileIndex.ts
View File

@@ -416,7 +416,7 @@ export class FileIndexSearchManager {
sortedSearch.then(complete => {
this.sendAsBatches(complete.results, onBatch, FileIndexSearchManager.BATCH_SIZE);
c(complete);
}, e, onBatch);
}, e);
}, () => {
sortedSearch.cancel();
});