From f6dc598fc4bc48a455eb10145bba5edc57aadfd2 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 23 Oct 2018 22:12:43 -0700
Subject: [PATCH] Fix #61081 - Ensure no search results are returned after
 cancel

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

diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index ffe674f6c91..31e60a2b016 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -135,7 +135,15 @@ export class SearchService extends Disposable implements ISearchService {
 					return TPromise.wrapError(canceled());
 				}
 
-				return this.searchWithProviders(query, onProgress, token);
+				const progressCallback = (item: ISearchProgressItem) => {
+					if (token && token.isCancellationRequested) {
+						return;
+					}
+
+					onProgress(item);
+				};
+
+				return this.searchWithProviders(query, progressCallback, token);
 			})
 			.then(completes => {
 				completes = completes.filter(c => !!c);