development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #60672 - don't start search if token is already canceled

Browse source
This commit is contained in:
Rob Lourens 2018-10-15 10:53:18 -07:00
parent 51103bd6c6
commit ef8bb5b845
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/services/search/node/searchService.ts
View file

@ -461,6 +461,10 @@ export class DiskSearch implements ISearchResultProvider {
const folderQueries = query.folderQueries || [];
return TPromise.join(folderQueries.map(q => q.folder.scheme === Schemas.file && pfs.exists(q.folder.fsPath)))
.then(exists => {
if (token && token.isCancellationRequested) {
throw canceled();
}
const existingFolders = folderQueries.filter((q, index) => exists[index]);
const rawSearch = this.rawSearchQuery(query, existingFolders);