chore(vscode): update to 1.53.2

These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.

lib/vscode/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts

@@ -20,4 +20,5 @@ export interface IHoverDelegateOptions {
 
 export interface IHoverDelegate {
 	showHover(options: IHoverDelegateOptions): IDisposable | undefined;
+	hideHover(): void;
 }

lib/vscode/src/vs/base/browser/ui/iconLabel/iconLabel.ts

@@ -16,16 +16,18 @@ import { AnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { isFunction, isString } from 'vs/base/common/types';
 import { domEvent } from 'vs/base/browser/event';
+import { localize } from 'vs/nls';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 
 export interface IIconLabelCreationOptions {
 	supportHighlights?: boolean;
 	supportDescriptionHighlights?: boolean;
-	supportCodicons?: boolean;
+	supportIcons?: boolean;
 	hoverDelegate?: IHoverDelegate;
 }
 
 export interface IIconLabelMarkdownString {
-	markdown: IMarkdownString | string | undefined | (() => Promise<IMarkdownString | string | undefined>);
+	markdown: IMarkdownString | string | undefined | ((token: CancellationToken) => Promise<IMarkdownString | string | undefined>);
 	markdownNotSupportedFallback: string | undefined;
 }
 
@@ -114,13 +116,13 @@ export class IconLabel extends Disposable {
 		this.descriptionContainer = this._register(new FastLabelNode(dom.append(this.labelContainer, dom.$('span.monaco-icon-description-container'))));
 
 		if (options?.supportHighlights) {
-			this.nameNode = new LabelWithHighlights(nameContainer, !!options.supportCodicons);
+			this.nameNode = new LabelWithHighlights(nameContainer, !!options.supportIcons);
 		} else {
 			this.nameNode = new Label(nameContainer);
 		}
 
 		if (options?.supportDescriptionHighlights) {
-			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.descriptionContainer.element, dom.$('span.label-description')), !!options.supportCodicons);
+			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.descriptionContainer.element, dom.$('span.label-description')), !!options.supportIcons);
 		} else {
 			this.descriptionNodeFactory = () => this._register(new FastLabelNode(dom.append(this.descriptionContainer.element, dom.$('span.label-description'))));
 		}
@@ -190,29 +192,47 @@ export class IconLabel extends Disposable {
 		}
 	}
 
-	private setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTMLElement, markdownTooltip: string | IIconLabelMarkdownString): void {
-		htmlElement.removeAttribute('title');
-		let tooltip: () => Promise<string | IMarkdownString | undefined>;
+	private static adjustXAndShowCustomHover(hoverOptions: IHoverDelegateOptions | undefined, mouseX: number | undefined, hoverDelegate: IHoverDelegate, isHovering: boolean) {
+		if (hoverOptions && isHovering) {
+			if (mouseX !== undefined) {
+				(<IHoverDelegateTarget>hoverOptions.target).x = mouseX + 10;
+			}
+			hoverDelegate.showHover(hoverOptions);
+		}
+	}
+
+	private getTooltipForCustom(markdownTooltip: string | IIconLabelMarkdownString): (token: CancellationToken) => Promise<string | IMarkdownString | undefined> {
 		if (isString(markdownTooltip)) {
-			tooltip = async () => markdownTooltip;
+			return async () => markdownTooltip;
 		} else if (isFunction(markdownTooltip.markdown)) {
-			tooltip = markdownTooltip.markdown;
+			return markdownTooltip.markdown;
 		} else {
 			const markdown = markdownTooltip.markdown;
-			tooltip = async () => markdown;
+			return async () => markdown;
 		}
+	}
+
+	private setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTMLElement, markdownTooltip: string | IIconLabelMarkdownString): void {
+		htmlElement.setAttribute('title', '');
+		htmlElement.removeAttribute('title');
+		let tooltip = this.getTooltipForCustom(markdownTooltip);
+
 		// Testing has indicated that on Windows and Linux 500 ms matches the native hovers most closely.
 		// On Mac, the delay is 1500.
 		const hoverDelay = isMacintosh ? 1500 : 500;
 		let hoverOptions: IHoverDelegateOptions | undefined;
 		let mouseX: number | undefined;
 		let isHovering = false;
+		let tokenSource: CancellationTokenSource;
 		function mouseOver(this: HTMLElement, e: MouseEvent): any {
 			if (isHovering) {
 				return;
 			}
+			tokenSource = new CancellationTokenSource();
 			function mouseLeaveOrDown(this: HTMLElement, e: MouseEvent): any {
 				isHovering = false;
+				hoverOptions = undefined;
+				tokenSource.dispose(true);
 				mouseLeaveDisposable.dispose();
 				mouseDownDisposable.dispose();
 			}
@@ -232,22 +252,26 @@ export class IconLabel extends Disposable {
 							targetElements: [this],
 							dispose: () => { }
 						};
-						const resolvedTooltip = await tooltip();
+						hoverOptions = {
+							text: localize('iconLabel.loading', "Loading..."),
+							target,
+							anchorPosition: AnchorPosition.BELOW
+						};
+						IconLabel.adjustXAndShowCustomHover(hoverOptions, mouseX, hoverDelegate, isHovering);
+
+						const resolvedTooltip = (await tooltip(tokenSource.token)) ?? (!isString(markdownTooltip) ? markdownTooltip.markdownNotSupportedFallback : undefined);
 						if (resolvedTooltip) {
 							hoverOptions = {
 								text: resolvedTooltip,
 								target,
 								anchorPosition: AnchorPosition.BELOW
 							};
+							// awaiting the tooltip could take a while. Make sure we're still hovering.
+							IconLabel.adjustXAndShowCustomHover(hoverOptions, mouseX, hoverDelegate, isHovering);
+						} else {
+							hoverDelegate.hideHover();
 						}
 					}
-					// awaiting the tooltip could take a while. Make sure we're still hovering.
-					if (hoverOptions && isHovering) {
-						if (mouseX !== undefined) {
-							(<IHoverDelegateTarget>hoverOptions.target).x = mouseX + 10;
-						}
-						hoverDelegate.showHover(hoverOptions);
-					}
 				}
 				mouseMoveDisposable.dispose();
 			}, hoverDelay);
@@ -336,7 +360,7 @@ class LabelWithHighlights {
 	private singleLabel: HighlightedLabel | undefined = undefined;
 	private options: IIconLabelValueOptions | undefined;
 
-	constructor(private container: HTMLElement, private supportCodicons: boolean) { }
+	constructor(private container: HTMLElement, private supportIcons: boolean) { }
 
 	setLabel(label: string | string[], options?: IIconLabelValueOptions): void {
 		if (this.label === label && equals(this.options, options)) {
@@ -350,7 +374,7 @@ class LabelWithHighlights {
 			if (!this.singleLabel) {
 				this.container.innerText = '';
 				this.container.classList.remove('multiple');
-				this.singleLabel = new HighlightedLabel(dom.append(this.container, dom.$('a.label-name', { id: options?.domId })), this.supportCodicons);
+				this.singleLabel = new HighlightedLabel(dom.append(this.container, dom.$('a.label-name', { id: options?.domId })), this.supportIcons);
 			}
 
 			this.singleLabel.set(label, options?.matches, undefined, options?.labelEscapeNewLines);
@@ -368,7 +392,7 @@ class LabelWithHighlights {
 				const id = options?.domId && `${options?.domId}_${i}`;
 
 				const name = dom.$('a.label-name', { id, 'data-icon-label-count': label.length, 'data-icon-label-index': i, 'role': 'treeitem' });
-				const highlightedLabel = new HighlightedLabel(dom.append(this.container, name), this.supportCodicons);
+				const highlightedLabel = new HighlightedLabel(dom.append(this.container, name), this.supportIcons);
 				highlightedLabel.set(l, m, undefined, options?.labelEscapeNewLines);
 
 				if (i < label.length - 1) {

lib/vscode/src/vs/base/browser/ui/iconLabel/iconLabels.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from 'vs/base/browser/dom';
+import { CSSIcon } from 'vs/base/common/codicons';
+
+const labelWithIconsRegex = /(\\)?\$\(([a-z\-]+(?:~[a-z\-]+)?)\)/gi;
+
+export function renderLabelWithIcons(text: string): Array<HTMLSpanElement | string> {
+	const elements = new Array<HTMLSpanElement | string>();
+	let match: RegExpMatchArray | null;
+
+	let textStart = 0, textStop = 0;
+	while ((match = labelWithIconsRegex.exec(text)) !== null) {
+		textStop = match.index || 0;
+		elements.push(text.substring(textStart, textStop));
+		textStart = (match.index || 0) + match[0].length;
+
+		const [, escaped, codicon] = match;
+		elements.push(escaped ? `$(${codicon})` : renderIcon({ id: codicon }));
+	}
+
+	if (textStart < text.length) {
+		elements.push(text.substring(textStart));
+	}
+	return elements;
+}
+
+export function renderIcon(icon: CSSIcon): HTMLSpanElement {
+	const node = dom.$(`span`);
+	node.classList.add(...CSSIcon.asClassNameArray(icon));
+	return node;
+}

lib/vscode/src/vs/base/browser/ui/iconLabel/iconlabel.css

@@ -55,6 +55,10 @@
 	white-space: pre; /* enable to show labels that include multiple whitespaces */
 }
 
+.monaco-icon-label.nowrap > .monaco-icon-label-container > .monaco-icon-description-container > .label-description{
+	white-space: nowrap
+}
+
 .vs .monaco-icon-label > .monaco-icon-label-container > .monaco-icon-description-container > .label-description {
 	opacity: .95;
 }
@@ -64,6 +68,16 @@
 	font-style: italic;
 }
 
+.monaco-icon-label.deprecated {
+	text-decoration: line-through;
+	opacity: 0.66;
+}
+
+/* make sure apply italic font style to decorations as well */
+.monaco-icon-label.italic::after {
+	font-style: italic;
+}
+
 .monaco-icon-label.strikethrough > .monaco-icon-label-container > .monaco-icon-name-container > .label-name,
 .monaco-icon-label.strikethrough > .monaco-icon-label-container > .monaco-icon-description-container > .label-description {
 	text-decoration: line-through;

lib/vscode/src/vs/base/browser/ui/iconLabel/simpleIconLabel.ts

@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { reset } from 'vs/base/browser/dom';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
+
+export class SimpleIconLabel {
+
+	constructor(
+		private readonly _container: HTMLElement
+	) { }
+
+	set text(text: string) {
+		reset(this._container, ...renderLabelWithIcons(text ?? ''));
+	}
+
+	set title(title: string) {
+		this._container.title = title;
+	}
+}