Only escape to   when needed (#309)

Author: Legend-Master

src/services/jsonHover.ts

@@ -116,7 +116,9 @@ function toMarkdown(plain: string | undefined): string | undefined {
 		return plain
 			.trim()
 			.replace(/[\\`*_{}[\]()<>#+\-.!]/g, '\\$&') // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
-			.replace(/([ \t]+)/g, (_match, g1) => '&nbsp;'.repeat(g1.length)) // escape spaces tabs
+			.replace(/(^ +)/mg, (_match, g1) => '&nbsp;'.repeat(g1.length)) // escape leading spaces on each line
+			.replace(/( {2,})/g, (_match, g1) => ' ' + '&nbsp;'.repeat(g1.length - 1)) // escape consecutive spaces
+			.replace(/(\t+)/g, (_match, g1) => '&nbsp;'.repeat(g1.length * 4)) // escape tabs
 			.replace(/\n/g, '\\\n'); // escape new lines
 	}
 	return undefined;

src/test/hover.test.ts

@@ -57,7 +57,7 @@ suite('JSON Hover', () => {
 			}
 		};
 		await testComputeInfo(content, schema, { line: 0, character: 0 }).then((result) => {
-			assert.deepEqual(result.contents, ['a very special object']);
+			assert.deepEqual(result.contents, ['a very special object']);
 		});
 		await testComputeInfo(content, schema, { line: 0, character: 1 }).then((result) => {
 			assert.deepEqual(result.contents, ['A']);
@@ -66,7 +66,7 @@ suite('JSON Hover', () => {
 			assert.deepEqual(result.contents, ['C']);
 		});
 		await testComputeInfo(content, schema, { line: 0, character: 37 }).then((result) => {
-			assert.deepEqual(result.contents, ['For&nbsp;example:\\\n\\\n\\<script\\>\\\n&nbsp;&nbsp;alert\\(1\\)\\\n\\</script\\>\\\n\\\n&nbsp;&nbsp;&nbsp;&nbsp;Test&nbsp;\\[1\\]']);
+			assert.deepEqual(result.contents, ['For example:\\\n\\\n\\<script\\>\\\n&nbsp;&nbsp;alert\\(1\\)\\\n\\</script\\>\\\n\\\n&nbsp;&nbsp;&nbsp;&nbsp;Test \\[1\\]']);
 		});
 		await testComputeInfo(content, schema, { line: 0, character: 7 }).then((result) => {
 			assert.deepEqual(result.contents, ['A']);
@@ -96,13 +96,13 @@ suite('JSON Hover', () => {
 			}]
 		};
 		await testComputeInfo(content, schema, { line: 0, character: 0 }).then((result) => {
-			assert.deepEqual(result.contents, ['a&nbsp;very&nbsp;special&nbsp;object']);
+			assert.deepEqual(result.contents, ['a very special object']);
 		});
 		await testComputeInfo(content, schema, { line: 0, character: 1 }).then((result) => {
 			assert.deepEqual(result.contents, ['A']);
 		});
 		await testComputeInfo(content, schema, { line: 0, character: 10 }).then((result) => {
-			assert.deepEqual(result.contents, ['B\n\nIt\'s&nbsp;B']);
+			assert.deepEqual(result.contents, ['B\n\nIt\'s B']);
 		});
 	});