From 3b0f87198d331ec7e59619624f09e727c538a643 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 17 Jul 2018 15:32:04 -0700
Subject: [PATCH] Removing PPromise - fix findTextInFiles

---
 .../api/electron-browser/mainThreadWorkspace.ts   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
index 2a3635b457d..59c54e164db 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
@@ -11,7 +11,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IFileMatch, IFolderQuery, IPatternInfo, IQueryOptions, ISearchConfiguration, ISearchQuery, ISearchService, QueryType } from 'vs/platform/search/common/search';
+import { IFileMatch, IFolderQuery, IPatternInfo, IQueryOptions, ISearchConfiguration, ISearchQuery, ISearchService, QueryType, ISearchProgressItem } from 'vs/platform/search/common/search';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
@@ -170,7 +170,13 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		const query = queryBuilder.text(pattern, folders, options);
 
 		return new TPromise((resolve, reject) => {
-			const search = this._searchService.search(query).then(
+			const onProgress = (p: ISearchProgressItem) => {
+				if (p.lineMatches) {
+					this._proxy.$handleTextSearchResult(p, requestId);
+				}
+			};
+
+			const search = this._searchService.search(query, onProgress).then(
 				() => {
 					delete this._activeSearches[requestId];
 					resolve(null);
@@ -182,11 +188,6 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 					}
 
 					return undefined;
-				},
-				p => {
-					if (p.lineMatches) {
-						this._proxy.$handleTextSearchResult(p, requestId);
-					}
 				});
 
 			this._activeSearches[requestId] = search;