From dffab45f20fce7cf26672ff8ca9a9750b68b012f Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 26 Feb 2018 11:49:35 +0100 Subject: [PATCH] #43216 Fix folder and file type computation --- src/vs/workbench/browser/parts/views/customView.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts index 82a8a0faf5c..3b90b48f0d6 100644 --- a/src/vs/workbench/browser/parts/views/customView.ts +++ b/src/vs/workbench/browser/parts/views/customView.ts @@ -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;