From 044be085056420ace00e8d3150b98cc5b0008593 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 7 Feb 2018 12:17:28 +0100
Subject: [PATCH] File label creates description DOM nodes even if description
 is empty (fixes #40208)

---
 src/vs/base/browser/ui/iconLabel/iconLabel.ts | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
index 93ece76d4bd..192c87c4bf1 100644
--- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
@@ -65,7 +65,11 @@ class FastLabelNode {
 		}
 
 		this._title = title;
-		this._element.title = title;
+		if (this._title) {
+			this._element.title = title;
+		} else {
+			this._element.removeAttribute('title');
+		}
 	}
 
 	public set empty(empty: boolean) {
@@ -84,24 +88,26 @@ class FastLabelNode {
 
 export class IconLabel {
 	private domNode: FastLabelNode;
+	private labelDescriptionContainer: FastLabelNode;
 	private labelNode: FastLabelNode | HighlightedLabel;
 	private descriptionNode: FastLabelNode | HighlightedLabel;
+	private descriptionNodeFactory: () => FastLabelNode | HighlightedLabel;
 
 	constructor(container: HTMLElement, options?: IIconLabelCreationOptions) {
 		this.domNode = new FastLabelNode(dom.append(container, dom.$('.monaco-icon-label')));
 
-		const labelDescriptionContainer = new FastLabelNode(dom.append(this.domNode.element, dom.$('.monaco-icon-label-description-container')));
+		this.labelDescriptionContainer = new FastLabelNode(dom.append(this.domNode.element, dom.$('.monaco-icon-label-description-container')));
 
 		if (options && options.supportHighlights) {
-			this.labelNode = new HighlightedLabel(dom.append(labelDescriptionContainer.element, dom.$('a.label-name')));
+			this.labelNode = new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')));
 		} else {
-			this.labelNode = new FastLabelNode(dom.append(labelDescriptionContainer.element, dom.$('a.label-name')));
+			this.labelNode = new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')));
 		}
 
 		if (options && options.supportDescriptionHighlights) {
-			this.descriptionNode = new HighlightedLabel(dom.append(labelDescriptionContainer.element, dom.$('span.label-description')));
+			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')));
 		} else {
-			this.descriptionNode = new FastLabelNode(dom.append(labelDescriptionContainer.element, dom.$('span.label-description')));
+			this.descriptionNodeFactory = () => new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')));
 		}
 	}
 
@@ -111,8 +117,7 @@ export class IconLabel {
 
 	public onClick(callback: (event: MouseEvent) => void): IDisposable {
 		return combinedDisposable([
-			dom.addDisposableListener(this.labelNode.element, dom.EventType.CLICK, (e: MouseEvent) => callback(e)),
-			dom.addDisposableListener(this.descriptionNode.element, dom.EventType.CLICK, (e: MouseEvent) => callback(e))
+			dom.addDisposableListener(this.labelDescriptionContainer.element, dom.EventType.CLICK, (e: MouseEvent) => callback(e)),
 		]);
 	}
 
@@ -131,26 +136,33 @@ export class IconLabel {
 		this.domNode.className = classes.join(' ');
 		this.domNode.title = options && options.title ? options.title : '';
 
-		const labelNode = this.labelNode;
-		if (labelNode instanceof HighlightedLabel) {
-			labelNode.set(label || '', options ? options.matches : void 0);
+		if (this.labelNode instanceof HighlightedLabel) {
+			this.labelNode.set(label || '', options ? options.matches : void 0);
 		} else {
-			labelNode.textContent = label || '';
+			this.labelNode.textContent = label || '';
 		}
 
-		const descriptionNode = this.descriptionNode;
-		if (descriptionNode instanceof HighlightedLabel) {
-			descriptionNode.set(description || '', options ? options.descriptionMatches : void 0);
-		} else {
-			descriptionNode.textContent = description || '';
-			descriptionNode.empty = !description;
+		if (description || this.descriptionNode) {
+			if (!this.descriptionNode) {
+				this.descriptionNode = this.descriptionNodeFactory(); // description node is created lazily on demand
+			}
+
+			if (this.descriptionNode instanceof HighlightedLabel) {
+				this.descriptionNode.set(description || '', options ? options.descriptionMatches : void 0);
+			} else {
+				this.descriptionNode.textContent = description || '';
+				this.descriptionNode.empty = !description;
+			}
 		}
 	}
 
 	public dispose(): void {
 		this.domNode.dispose();
 		this.labelNode.dispose();
-		this.descriptionNode.dispose();
+
+		if (this.descriptionNode) {
+			this.descriptionNode.dispose();
+		}
 	}
 }
 
-- 
GitLab