Fix #86497 by returing localResults instead of just triggering onProg…

…ress with them
microsoft · Dec 13, 2019 · 6e0f97c · 6e0f97c · JacksonKearl · Dec 13, 2019
1 parent 8ad11f8
commit 6e0f97c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts
@@ -59,7 +59,7 @@ export class SearchService extends Disposable implements ISearchService {
 		});
 	}
 
-	textSearch(query: ITextQuery, token?: CancellationToken, onProgress?: (item: ISearchProgressItem) => void): Promise<ISearchComplete> {
+	async textSearch(query: ITextQuery, token?: CancellationToken, onProgress?: (item: ISearchProgressItem) => void): Promise<ISearchComplete> {
 		// Get local results from dirty/untitled
 		const localResults = this.getLocalResults(query);
 
@@ -83,7 +83,11 @@ export class SearchService extends Disposable implements ISearchService {
 			}
 		};
 
-		return this.doSearch(query, token, onProviderProgress);
+		const otherResults = await this.doSearch(query, token, onProviderProgress);
+		return {
+			...otherResults,
+			results: [...otherResults.results, ...arrays.coalesce(localResults.values())]
+		};
 	}
 
 	fileSearch(query: IFileQuery, token?: CancellationToken): Promise<ISearchComplete> {