Fixes #11485: Don't set whitespace width if a line contains foreign e…

…lements
microsoft · Jul 5, 2017 · c6f8a5d · c6f8a5d
1 parent bef3bfd
commit c6f8a5d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -602,7 +602,7 @@ function _renderLine(input: ResolvedRenderLineInput): RenderLineOutput {
 			}
 
 			characterMapping.setPartLength(partIndex, partContentCnt);
-			if (fontIsMonospace) {
+			if (fontIsMonospace || containsForeignElements) {
 				out += `<span class="${partType}">${partContent}</span>`;
 			} else {
 				out += `<span class="${partType}" style="width:${spaceWidth * partContentCnt}px">${partContent}</span>`;

diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -1011,6 +1011,35 @@ suite('viewLineRenderer.renderLine 2', () => {
 		].join(''));
 	});
 
+	test('issue #11485: Visible whitespace conflicts with before decorator attachment', () => {
+
+		let lineContent = '\tbla';
+
+		let actual = renderViewLine(new RenderLineInput(
+			false,
+			lineContent,
+			false,
+			0,
+			[createPart(4, 3)],
+			[new LineDecoration(1, 2, 'before', true)],
+			4,
+			10,
+			-1,
+			'all',
+			false,
+			true
+		));
+
+		let expected = [
+			'<span>',
+			'<span class="vs-whitespace before">&rarr;&nbsp;&nbsp;&nbsp;</span>',
+			'<span class="mtk3">bla</span>',
+			'</span>'
+		].join('');
+
+		assert.deepEqual(actual.html, expected);
+	});
+
 	function createTestGetColumnOfLinePartOffset(lineContent: string, tabSize: number, parts: ViewLineToken[], expectedPartLengths: number[]): (partIndex: number, partLength: number, offset: number, expected: number) => void {
 		let renderLineOutput = renderViewLine(new RenderLineInput(
 			false,