From 8ee75c19bb39c7433a042647d29d34327a3d55f6 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Fri, 27 Nov 2020 18:08:50 +0100
Subject: [PATCH] Escape more white space in appendText Fixes #110464

---
 src/vs/base/common/htmlContent.ts                 |  2 +-
 src/vs/base/test/browser/markdownRenderer.test.ts |  4 ++--
 src/vs/base/test/common/markdownString.test.ts    | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts
index 7272e813245..829a3480092 100644
--- a/src/vs/base/common/htmlContent.ts
+++ b/src/vs/base/common/htmlContent.ts
@@ -49,7 +49,7 @@ export class MarkdownString implements IMarkdownString {
 		// escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
 		this.value += (this.supportThemeIcons ? escapeCodicons(value) : value)
 			.replace(/[\\`*_{}[\]()#+\-.!]/g, '\\$&')
-			.replace(/^([ \t]+)(.+)$/gm, (_match, g1, g2) => '&nbsp;'.repeat(g1.length) + g2)
+			.replace(/([ \t]+)/g, (_match, g1) => '&nbsp;'.repeat(g1.length))
 			.replace(/^>/gm, '\\>')
 			.replace(/\n/g, newlineStyle === MarkdownStringTextNewlineStyle.Break ? '\\\n' : '\n\n');
 
diff --git a/src/vs/base/test/browser/markdownRenderer.test.ts b/src/vs/base/test/browser/markdownRenderer.test.ts
index 170f1935c09..f4bfa18d1c7 100644
--- a/src/vs/base/test/browser/markdownRenderer.test.ts
+++ b/src/vs/base/test/browser/markdownRenderer.test.ts
@@ -57,7 +57,7 @@ suite('MarkdownRenderer', () => {
 			mds.appendText('$(zap) $(not a theme icon) $(add)');
 
 			let result: HTMLElement = renderMarkdown(mds);
-			assert.strictEqual(result.innerHTML, `<p>$(zap) $(not a theme icon) $(add)</p>`);
+			assert.strictEqual(result.innerHTML, `<p>$(zap)&nbsp;$(not&nbsp;a&nbsp;theme&nbsp;icon)&nbsp;$(add)</p>`);
 		});
 
 		test('render appendMarkdown', () => {
@@ -85,7 +85,7 @@ suite('MarkdownRenderer', () => {
 			mds.appendText('$(zap) $(not a theme icon) $(add)');
 
 			let result: HTMLElement = renderMarkdown(mds);
-			assert.strictEqual(result.innerHTML, `<p>$(zap) $(not a theme icon) $(add)</p>`);
+			assert.strictEqual(result.innerHTML, `<p>$(zap)&nbsp;$(not&nbsp;a&nbsp;theme&nbsp;icon)&nbsp;$(add)</p>`);
 		});
 
 		test('render appendMarkdown with escaped icon', () => {
diff --git a/src/vs/base/test/common/markdownString.test.ts b/src/vs/base/test/common/markdownString.test.ts
index a76c30f2cc5..424c2bd4673 100644
--- a/src/vs/base/test/common/markdownString.test.ts
+++ b/src/vs/base/test/common/markdownString.test.ts
@@ -11,13 +11,13 @@ suite('MarkdownString', () => {
 	test('Escape leading whitespace', function () {
 		const mds = new MarkdownString();
 		mds.appendText('Hello\n    Not a code block');
-		assert.equal(mds.value, 'Hello\n\n&nbsp;&nbsp;&nbsp;&nbsp;Not a code block');
+		assert.equal(mds.value, 'Hello\n\n&nbsp;&nbsp;&nbsp;&nbsp;Not&nbsp;a&nbsp;code&nbsp;block');
 	});
 
 	test('MarkdownString.appendText doesn\'t escape quote #109040', function () {
 		const mds = new MarkdownString();
 		mds.appendText('> Text\n>More');
-		assert.equal(mds.value, '\\> Text\n\n\\>More');
+		assert.equal(mds.value, '\\>&nbsp;Text\n\n\\>More');
 	});
 
 	test('appendText', () => {
@@ -25,7 +25,7 @@ suite('MarkdownString', () => {
 		const mds = new MarkdownString();
 		mds.appendText('# foo\n*bar*');
 
-		assert.equal(mds.value, '\\# foo\n\n\\*bar\\*');
+		assert.equal(mds.value, '\\#&nbsp;foo\n\n\\*bar\\*');
 	});
 
 	suite('ThemeIcons', () => {
@@ -36,7 +36,7 @@ suite('MarkdownString', () => {
 				const mds = new MarkdownString(undefined, { supportThemeIcons: true });
 				mds.appendText('$(zap) $(not a theme icon) $(add)');
 
-				assert.equal(mds.value, '\\\\$\\(zap\\) $\\(not a theme icon\\) \\\\$\\(add\\)');
+				assert.equal(mds.value, '\\\\$\\(zap\\)&nbsp;$\\(not&nbsp;a&nbsp;theme&nbsp;icon\\)&nbsp;\\\\$\\(add\\)');
 			});
 
 			test('appendMarkdown', () => {
@@ -61,7 +61,7 @@ suite('MarkdownString', () => {
 				const mds = new MarkdownString(undefined, { supportThemeIcons: false });
 				mds.appendText('$(zap) $(not a theme icon) $(add)');
 
-				assert.equal(mds.value, '$\\(zap\\) $\\(not a theme icon\\) $\\(add\\)');
+				assert.equal(mds.value, '$\\(zap\\)&nbsp;$\\(not&nbsp;a&nbsp;theme&nbsp;icon\\)&nbsp;$\\(add\\)');
 			});
 
 			test('appendMarkdown', () => {
-- 
GitLab