From 8655fff1e6a6f0d864bac6aef51c426fd55f85e9 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Sat, 11 Apr 2020 12:27:27 -0500 Subject: [PATCH 1/2] Don't wait on search providers for schemes other than vscode-remote Fix #94928 --- .../workbench/services/search/common/searchService.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts index 2486dc7fd90f7..392e7eb4a6f70 100644 --- a/src/vs/workbench/services/search/common/searchService.ts +++ b/src/vs/workbench/services/search/common/searchService.ts @@ -203,14 +203,17 @@ export class SearchService extends Disposable implements ISearchService { this.fileSearchProviders.get(scheme) : this.textSearchProviders.get(scheme); - if (!provider && scheme === 'file') { + if (!provider && scheme === Schemas.file) { diskSearchQueries.push(...schemeFQs); } else { - if (!provider) { - console.warn(`No search provider registered for scheme: ${scheme}, waiting`); - provider = await this.waitForProvider(query.type, scheme); + if (!provider && scheme !== Schemas.vscodeRemote) { + console.warn(`No search provider registered for scheme: ${scheme}`); + return; } + console.warn(`No search provider registered for scheme: ${scheme}, waiting`); + provider = await this.waitForProvider(query.type, scheme); + const oneSchemeQuery: ISearchQuery = { ...query, ...{ From 723955d37e6d9760d91ac3eeb296dcdfa0b7cd6c Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Mon, 13 Apr 2020 11:02:49 -0500 Subject: [PATCH 2/2] Fix search provider wait --- .../services/search/common/searchService.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts index 392e7eb4a6f70..2471bd110a9fd 100644 --- a/src/vs/workbench/services/search/common/searchService.ts +++ b/src/vs/workbench/services/search/common/searchService.ts @@ -206,13 +206,15 @@ export class SearchService extends Disposable implements ISearchService { if (!provider && scheme === Schemas.file) { diskSearchQueries.push(...schemeFQs); } else { - if (!provider && scheme !== Schemas.vscodeRemote) { - console.warn(`No search provider registered for scheme: ${scheme}`); - return; - } + if (!provider) { + if (scheme !== Schemas.vscodeRemote) { + console.warn(`No search provider registered for scheme: ${scheme}`); + return; + } - console.warn(`No search provider registered for scheme: ${scheme}, waiting`); - provider = await this.waitForProvider(query.type, scheme); + console.warn(`No search provider registered for scheme: ${scheme}, waiting`); + provider = await this.waitForProvider(query.type, scheme); + } const oneSchemeQuery: ISearchQuery = { ...query,