From ef8bb5b8456744051651a8594f4bd6230f946fab Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 15 Oct 2018 10:53:18 -0700
Subject: [PATCH] Fix #60672 - don't start search if token is already canceled

---
 src/vs/workbench/services/search/node/searchService.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index 498f266d123..b8cec951e08 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -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);
 
-- 
GitLab