Icons missing from extension trees with resource uris (#152039) (#152050)

alexr00 · web-flow · commit b265e08e1d5a · 2022-06-14T14:40:06.000+02:00
Fixes #152036
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -1087,7 +1087,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 	private shouldHideResourceLabelIcon(iconUrl: URI | undefined, icon: ThemeIcon | undefined): boolean {
 		// We always hide the resource label in favor of the iconUrl when it's provided.
 		// When `ThemeIcon` is provided, we hide the resource label icon in favor of it only if it's a not a file icon.
-		return !!iconUrl || !this.isFileKindThemeIcon(icon);
+		return (!!iconUrl || (!!icon && !this.isFileKindThemeIcon(icon)));
 	}
 
 	private shouldShowThemeIcon(hasResource: boolean, icon: ThemeIcon | undefined): icon is ThemeIcon {

Original file line number	Diff line number	Diff line change
`@@ -1087,7 +1087,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS`
`1087`	`1087`	`private shouldHideResourceLabelIcon(iconUrl: URI \| undefined, icon: ThemeIcon \| undefined): boolean {`
`1088`	`1088`	`// We always hide the resource label in favor of the iconUrl when it's provided.`
`1089`	`1089`	// When `ThemeIcon` is provided, we hide the resource label icon in favor of it only if it's a not a file icon.
`1090`		`- return !!iconUrl \|\| !this.isFileKindThemeIcon(icon);`
	`1090`	`+ return (!!iconUrl \|\| (!!icon && !this.isFileKindThemeIcon(icon)));`
`1091`	`1091`	`}`
`1092`	`1092`
`1093`	`1093`	`private shouldShowThemeIcon(hasResource: boolean, icon: ThemeIcon \| undefined): icon is ThemeIcon {`