From 254c7dc359ff63b75890551ea5bef82508c16f8b Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 10 May 2021 18:17:21 +0200
Subject: [PATCH] Syntax token inspector doesn't show font-style changes caused
 by semantic highlighting. Fixes #123299

---
 .../inspectEditorTokens/inspectEditorTokens.ts      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
index 3fd351fc49e..33143587fca 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
@@ -416,10 +416,17 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 		const fontStyleLabels = new Array<HTMLElement | string>();
 
 		function addStyle(key: 'bold' | 'italic' | 'underline') {
+			let label: HTMLElement | string | undefined;
 			if (semantic && semantic[key]) {
-				fontStyleLabels.push($('span.tiw-metadata-semantic', undefined, key));
+				label = $('span.tiw-metadata-semantic', undefined, key);
 			} else if (tm && tm[key]) {
-				fontStyleLabels.push(key);
+				label = key;
+			}
+			if (label) {
+				if (fontStyleLabels.length) {
+					fontStyleLabels.push(' ');
+				}
+				fontStyleLabels.push(label);
 			}
 		}
 		addStyle('bold');
@@ -428,7 +435,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 		if (fontStyleLabels.length) {
 			elements.push($('tr', undefined,
 				$('td.tiw-metadata-key', undefined, 'font style' as string),
-				$('td.tiw-metadata-value', undefined, fontStyleLabels.join(' '))
+				$('td.tiw-metadata-value', undefined, ...fontStyleLabels)
 			));
 		}
 		return elements;
-- 
GitLab