From 8ec26a222a9c09cda2d34be287b4d52bbea90956 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 15 Aug 2018 10:51:29 -0700 Subject: [PATCH] Fix #56433 - search extraFileResources even when no folders open --- src/vs/workbench/services/search/node/searchService.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts index 5d0ce0948d9..5bf7b93503c 100644 --- a/src/vs/workbench/services/search/node/searchService.ts +++ b/src/vs/workbench/services/search/node/searchService.ts @@ -207,12 +207,15 @@ export class SearchService extends Disposable implements ISearchService { } }); - if (diskSearchQueries.length) { - const diskSearchQuery = { + const diskSearchExtraFileResources = query.extraFileResources && query.extraFileResources.filter(res => res.scheme === 'file'); + + if (diskSearchQueries.length || diskSearchExtraFileResources) { + const diskSearchQuery: ISearchQuery = { ...query, ...{ folderQueries: diskSearchQueries - } + }, + extraFileResources: diskSearchExtraFileResources }; searchPs.push(this.diskSearch.search(diskSearchQuery, onProviderProgress)); -- GitLab