Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 19:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into joh/ftp

Browse Source
This commit is contained in:
Johannes Rieken
2017-09-18 11:01:12 +02:00
parent 853c9a1495 1967cd3d7f
commit 9bc31f1ca6
401 changed files with 2685 additions and 1524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
View File

@@ -66,7 +66,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
return undefined;
}
const query: ISearchQuery = {
folderQueries: workspace.folders.map(root => ({ folder: root })),
folderQueries: workspace.folders.map(folder => ({ folder: folder.uri })),
type: QueryType.File,
maxResults,
includePattern: { [include]: true },