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

Fix #29760

Browse Source
This commit is contained in:
Sandeep Somavarapu
2017-06-30 10:48:20 +02:00
parent ac2d0704b6
commit db5e65b727
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/vs/workbench/parts/search/browser/searchViewlet.ts
View File

@@ -893,13 +893,33 @@ export class SearchViewlet extends Viewlet {
}
public searchInFolder(resource: URI): void {
let folderPath = null;
const workspace = this.contextService.getWorkspace2();
if (workspace) {
if (workspace.roots.length === 1) {
// Fallback to old way for single root workspace
folderPath = this.contextService.toWorkspaceRelativePath(resource);
if (folderPath && folderPath !== '.') {
folderPath = './' + folderPath;
}
} else {
folderPath = resource.fsPath;
}
}
if (!folderPath || folderPath === '.') {
this.inputPatternIncludes.setValue('');
this.searchWidget.focus();
return;
}
// Show 'files to include' box
if (!this.showsFileTypes()) {
this.toggleQueryDetails(true, true);
}
this.inputPatternIncludes.setIsGlobPattern(false);
this.inputPatternIncludes.setValue(resource.fsPath);
this.inputPatternIncludes.setValue(folderPath);
this.searchWidget.focus(false);
}