Merge pull request microsoft#94968 from jeanp413/fix-94323

jrieken · web-flow · commit 53bbba0b8f08 · 2020-04-15T10:18:09.000+02:00
Fixes rename preview "Group Changes By File" view doesn't show the reference type icon info
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css b/src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css
@@ -53,22 +53,32 @@
 	align-items: center;
 }
 
-.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .theme-icon {
+.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .theme-icon,
+.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .theme-icon {
 	margin-right: 4px;
 }
 
-.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon {
+.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
+.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon {
 	background-repeat: no-repeat;
 	background-image: var(--background-light);
 	background-position: left center;
 	background-size: contain;
 	margin-right: 4px;
 	height: 100%;
 	width: 16px;
+	min-width: 16px;
 }
 
 .vs-dark .monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
-.hc-black .monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon
+.hc-black .monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
+.vs-dark .monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon,
+.hc-black .monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon
 {
 	background-image: var(--background-dark);
 }
+
+.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .monaco-highlighted-label {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts
@@ -525,17 +525,22 @@ class TextEditElementTemplate {
 	private readonly _localDisposables = new DisposableStore();
 
 	private readonly _checkbox: HTMLInputElement;
+	private readonly _icon: HTMLDivElement;
 	private readonly _label: HighlightedLabel;
 
 	constructor(container: HTMLElement) {
+		container.classList.add('textedit');
+
 		this._checkbox = document.createElement('input');
 		this._checkbox.className = 'edit-checkbox';
 		this._checkbox.type = 'checkbox';
 		this._checkbox.setAttribute('role', 'checkbox');
 		container.appendChild(this._checkbox);
 
+		this._icon = document.createElement('div');
+		container.appendChild(this._icon);
+
 		this._label = new HighlightedLabel(container, false);
-		dom.addClass(this._label.element, 'textedit');
 	}
 
 	dispose(): void {
@@ -575,7 +580,36 @@ class TextEditElementTemplate {
 			title = metadata.label;
 		}
 
+		const iconPath = metadata?.iconPath;
+		if (!iconPath) {
+			this._icon.style.display = 'none';
+		} else {
+			this._icon.style.display = 'block';
+
+			this._icon.style.setProperty('--background-dark', null);
+			this._icon.style.setProperty('--background-light', null);
+
+			if (ThemeIcon.isThemeIcon(iconPath)) {
+				// css
+				const className = ThemeIcon.asClassName(iconPath);
+				this._icon.className = className ? `theme-icon ${className}` : '';
+
+			} else if (URI.isUri(iconPath)) {
+				// background-image
+				this._icon.className = 'uri-icon';
+				this._icon.style.setProperty('--background-dark', `url("${iconPath.toString(true)}")`);
+				this._icon.style.setProperty('--background-light', `url("${iconPath.toString(true)}")`);
+
+			} else {
+				// background-image
+				this._icon.className = 'uri-icon';
+				this._icon.style.setProperty('--background-dark', `url("${iconPath.dark.toString(true)}")`);
+				this._icon.style.setProperty('--background-light', `url("${iconPath.light.toString(true)}")`);
+			}
+		}
+
 		this._label.set(value, [selectHighlight, insertHighlight], title, true);
+		this._icon.title = title || '';
 	}
 }
 
