💄 #43216

src/vs/platform/theme/common/themeService.ts

@@ -21,6 +21,14 @@ export function themeColorFromId(id: ColorIdentifier) {
 	return { id };
 }
 
+// theme icon
+export interface ThemeIcon {
+	readonly id: string;
+}
+
+export const FileThemeIcon = { id: 'file' };
+export const FolderThemeIcon = { id: 'folder' };
+
 // base themes
 export const DARK: ThemeType = 'dark';
 export const LIGHT: ThemeType = 'light';

src/vs/workbench/api/node/extHostTreeViews.ts

@@ -12,7 +12,7 @@ import { debounceEvent } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { ExtHostTreeViewsShape, MainThreadTreeViewsShape } from './extHost.protocol';
-import { ITreeItem, TreeViewItemHandleArg, IThemeIcon } from 'vs/workbench/common/views';
+import { ITreeItem, TreeViewItemHandleArg } from 'vs/workbench/common/views';
 import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/node/extHostCommands';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { TreeItemCollapsibleState, ThemeIcon } from 'vs/workbench/api/node/extHostTypes';
@@ -288,6 +288,7 @@ class ExtHostTreeView<T> extends Disposable {
 			contextValue: extensionTreeItem.contextValue,
 			icon,
 			iconDark: this.getDarkIconPath(extensionTreeItem) || icon,
+			themeIcon: extensionTreeItem.iconPath instanceof ThemeIcon ? { id: extensionTreeItem.iconPath.id } : void 0,
 			collapsibleState: isUndefinedOrNull(extensionTreeItem.collapsibleState) ? TreeItemCollapsibleState.None : extensionTreeItem.collapsibleState
 		};
 
@@ -315,11 +316,10 @@ class ExtHostTreeView<T> extends Disposable {
 		throw new Error('This should not be reached');
 	}
 
-	private getLightIconPath(extensionTreeItem: vscode.TreeItem): string | IThemeIcon {
-		if (extensionTreeItem.iconPath) {
+	private getLightIconPath(extensionTreeItem: vscode.TreeItem): string {
+		if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon)) {
 			if (typeof extensionTreeItem.iconPath === 'string'
-				|| extensionTreeItem.iconPath instanceof URI
-				|| extensionTreeItem.iconPath instanceof ThemeIcon) {
+				|| extensionTreeItem.iconPath instanceof URI) {
 				return this.getIconPath(extensionTreeItem.iconPath);
 			}
 			return this.getIconPath(extensionTreeItem.iconPath['light']);
@@ -327,20 +327,17 @@ class ExtHostTreeView<T> extends Disposable {
 		return void 0;
 	}
 
-	private getDarkIconPath(extensionTreeItem: vscode.TreeItem): string | IThemeIcon {
-		if (extensionTreeItem.iconPath && extensionTreeItem.iconPath['dark']) {
+	private getDarkIconPath(extensionTreeItem: vscode.TreeItem): string {
+		if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon) && extensionTreeItem.iconPath['dark']) {
 			return this.getIconPath(extensionTreeItem.iconPath['dark']);
 		}
 		return void 0;
 	}
 
-	private getIconPath(iconPath: string | URI | ThemeIcon): string | IThemeIcon {
+	private getIconPath(iconPath: string | URI): string {
 		if (iconPath instanceof URI) {
 			return iconPath.toString();
 		}
-		if (iconPath instanceof ThemeIcon) {
-			return { id: iconPath.id };
-		}
 		return URI.file(iconPath).toString();
 	}
 

src/vs/workbench/browser/parts/views/customView.ts

@@ -11,9 +11,9 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
 import { $ } from 'vs/base/browser/builder';
-import { LIGHT } from 'vs/platform/theme/common/themeService';
+import { LIGHT, FileThemeIcon, FolderThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ITree, IDataSource, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
-import { TreeItemCollapsibleState, ITreeItem, ITreeViewer, ICustomViewsService, ITreeViewDataProvider, ViewsRegistry, IViewDescriptor, TreeViewItemHandleArg, ICustomViewDescriptor, IViewsViewlet, FileThemeIconId, FolderThemeIconId } from 'vs/workbench/common/views';
+import { TreeItemCollapsibleState, ITreeItem, ITreeViewer, ICustomViewsService, ITreeViewDataProvider, ViewsRegistry, IViewDescriptor, TreeViewItemHandleArg, ICustomViewDescriptor, IViewsViewlet } from 'vs/workbench/common/views';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress';
@@ -447,19 +447,8 @@ class TreeRenderer implements IRenderer {
 		DOM.removeClass(templateData.label, 'custom-view-tree-node-item-label');
 		DOM.removeClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel');
 
-		if (resource && (typeof icon !== 'string')) {
-			let fileKind = node.collapsibleState === TreeItemCollapsibleState.Collapsed || node.collapsibleState === TreeItemCollapsibleState.Expanded ? FileKind.FOLDER : FileKind.FILE;
-			if (icon && icon.id) {
-				switch (icon.id) {
-					case FileThemeIconId:
-						fileKind = FileKind.FILE;
-						break;
-					case FolderThemeIconId:
-						fileKind = FileKind.FOLDER;
-						break;
-				}
-			}
-			templateData.resourceLabel.setLabel({ name: label, resource }, { fileKind, title: node.tooltip });
+		if (resource && !icon) {
+			templateData.resourceLabel.setLabel({ name: label, resource }, { fileKind: this.getFileKind(node), title: node.tooltip });
 			DOM.addClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel');
 		} else {
 			templateData.label.textContent = label;
@@ -472,6 +461,18 @@ class TreeRenderer implements IRenderer {
 		templateData.actionBar.push(this.menus.getResourceActions(node), { icon: true, label: false });
 	}
 
+	private getFileKind(node: ITreeItem): FileKind {
+		if (node.themeIcon) {
+			switch (node.themeIcon.id) {
+				case FileThemeIcon.id:
+					return FileKind.FILE;
+				case FolderThemeIcon.id:
+					return FileKind.FOLDER;
+			}
+		}
+		return node.collapsibleState === TreeItemCollapsibleState.Collapsed || node.collapsibleState === TreeItemCollapsibleState.Expanded ? FileKind.FOLDER : FileKind.FILE;
+	}
+
 	public disposeTemplate(tree: ITree, templateId: string, templateData: ITreeExplorerTemplateData): void {
 		templateData.resourceLabel.dispose();
 		templateData.actionBar.dispose();
@@ -505,7 +506,7 @@ class TreeItemIcon extends Disposable {
 			const fileIconTheme = this.themeService.getFileIconTheme();
 			const contributedIcon = this.themeService.getTheme().type === LIGHT ? this._treeItem.icon : this._treeItem.iconDark;
 
-			const hasContributedIcon = typeof contributedIcon === 'string';
+			const hasContributedIcon = !!contributedIcon;
 			const hasChildren = this._treeItem.collapsibleState !== TreeItemCollapsibleState.None;
 			const hasResource = !!this._treeItem.resourceUri;
 			const isFolder = hasResource && hasChildren;

src/vs/workbench/common/views.ts

@@ -13,6 +13,7 @@ import { localize } from 'vs/nls';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 
 export class ViewLocation {
 
@@ -202,13 +203,6 @@ export enum TreeItemCollapsibleState {
 	Expanded = 2
 }
 
-export const FileThemeIconId = 'file';
-export const FolderThemeIconId = 'folder';
-
-export interface IThemeIcon {
-	readonly id: string;
-}
-
 export interface ITreeItem {
 
 	handle: string;
@@ -219,9 +213,11 @@ export interface ITreeItem {
 
 	label?: string;
 
-	icon?: string | IThemeIcon;
+	icon?: string;
+
+	iconDark?: string;
 
-	iconDark?: string | IThemeIcon;
+	themeIcon?: ThemeIcon;
 
 	resourceUri?: UriComponents;