Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't wait on search providers for schemes other than vscode-remote #95010

Merged
merged 2 commits into from
Apr 15, 2020
Merged

Don't wait on search providers for schemes other than vscode-remote #95010

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8655fff
Don't wait on search providers for schemes other than vscode-remote
roblourens Apr 11, 2020
723955d
Fix search provider wait
roblourens Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/vs/workbench/services/search/common/searchService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,15 @@ 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) {
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);
}
Expand Down