microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-10 16:58:55 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Fix #51414 - show workspace folder names in search tree

Browse Source
This commit is contained in:
Rob Lourens
2018-06-07 21:16:50 -07:00
parent a8978c6a9e
commit 0cae1cd53a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/parts/search/browser/searchResultsView.ts
View File

@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as nls from 'vs/nls';
import * as resources from 'vs/base/common/resources';
import * as paths from 'vs/base/common/paths';
import * as DOM from 'vs/base/browser/dom';
import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -148,7 +149,8 @@ export class SearchRenderer extends Disposable implements IRenderer {
actionRunner: IActionRunner,
private searchView: SearchView,
@IInstantiationService private instantiationService: IInstantiationService,
@IThemeService private themeService: IThemeService
@IThemeService private themeService: IThemeService,
@IWorkspaceContextService protected contextService: IWorkspaceContextService
) {
super();
}
@@ -234,7 +236,11 @@ export class SearchRenderer extends Disposable implements IRenderer {
private renderFolderMatch(tree: ITree, folderMatch: FolderMatch, templateData: IFolderMatchTemplate): void {
if (folderMatch.hasRoot()) {
templateData.label.setFile(folderMatch.resource(), { fileKind: FileKind.FOLDER });
const fileKind = resources.isEqual(this.contextService.getWorkspaceFolder(folderMatch.resource()).uri, folderMatch.resource()) ?
FileKind.ROOT_FOLDER :
FileKind.FOLDER;
templateData.label.setFile(folderMatch.resource(), { fileKind });
} else {
templateData.label.setValue(nls.localize('searchFolderMatch.other.label', "Other files"));
}