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

#43216 Fix folder and file type computation

Browse Source
This commit is contained in:
Sandeep Somavarapu
2018-02-26 11:49:35 +01:00
parent 3de4e2f515
commit dffab45f20
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vs/workbench/browser/parts/views/customView.ts
View File

@@ -334,7 +334,8 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
}
if (node.resourceUri) {
const fileIconTheme = this.themeService.getFileIconTheme();
if (node.collapsibleState !== TreeItemCollapsibleState.None) {
const isFolder = node.themeIcon ? node.themeIcon.id === FolderThemeIcon.id : node.collapsibleState !== TreeItemCollapsibleState.None;
if (isFolder) {
return fileIconTheme.hasFileIcons && fileIconTheme.hasFolderIcons;
}
return fileIconTheme.hasFileIcons;
@@ -509,8 +510,8 @@ class TreeItemIcon extends Disposable {
const hasContributedIcon = !!contributedIcon;
const hasChildren = this._treeItem.collapsibleState !== TreeItemCollapsibleState.None;
const hasResource = !!this._treeItem.resourceUri;
const isFolder = hasResource && hasChildren;
const isFile = hasResource && !hasChildren;
const isFolder = hasResource && this._treeItem.themeIcon ? this._treeItem.themeIcon.id === FolderThemeIcon.id : hasChildren;
const isFile = hasResource && this._treeItem.themeIcon ? this._treeItem.themeIcon.id === FileThemeIcon.id : !hasChildren;
const hasThemeFolderIcon = isFolder && fileIconTheme.hasFileIcons && fileIconTheme.hasFolderIcons;
const hasThemeFileIcon = isFile && fileIconTheme.hasFileIcons;
const hasIcon = hasContributedIcon || hasThemeFolderIcon || hasThemeFileIcon;