Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ben/editor

Browse Source
This commit is contained in:
Benjamin Pasero
2018-05-25 12:15:55 +02:00
parent 2a3930133d 4e262c2bb3
commit c386392f87
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/api/electron-browser/mainThreadSearch.ts
View File

@@ -100,6 +100,9 @@ class RemoteSearchProvider implements ISearchResultProvider {
}
const folderQueriesForScheme = query.folderQueries.filter(fq => fq.folder.scheme === this._scheme);
if (!folderQueriesForScheme.length) {
return TPromise.wrap(null);
}
query = {
...query,