Fixes editor layout issues

microsoft · Nov 21, 2023 · f8b66f6 · f8b66f6
1 parent 943428e
commit f8b66f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorEditors.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorEditors.ts
@@ -121,6 +121,8 @@ export class DiffEditorEditors extends Disposable {
 			result.unicodeHighlight = this._options.editorOptions.get().unicodeHighlight || {};
 			result.wordWrapOverride1 = this._options.diffWordWrap.get();
 		}
+		result.glyphMargin = this._options.renderSideBySide.get();
+
 		if (changedOptions.originalAriaLabel) {
 			result.ariaLabel = changedOptions.originalAriaLabel;
 		}

diff --git a/src/vs/editor/browser/widget/multiDiffEditorWidget/diffEditorItemTemplate.ts b/src/vs/editor/browser/widget/multiDiffEditorWidget/diffEditorItemTemplate.ts
@@ -79,7 +79,7 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 					flexDirection: 'column',
 				}
 			}, [
-				h('div@editor', { style: { flex: '1' } }),
+				h('div.editorContainer@editor', { style: { flex: '1' } }),
 			])
 		])
 	]);

diff --git a/src/vs/editor/browser/widget/multiDiffEditorWidget/style.css b/src/vs/editor/browser/widget/multiDiffEditorWidget/style.css
@@ -16,7 +16,7 @@
 	border-left: 2px var(--vscode-notebook-focusedCellBorder) solid;
 }
 
-.monaco-component .multiDiffEntry .editor {
+.monaco-component .multiDiffEntry .editorParent .editorContainer {
 	border-left: 17px var(--vscode-tab-inactiveBackground) solid;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     					flexDirection: 'column',
     				}
     			}, [
-    				h('div@editor', { style: { flex: '1' } }),
+    				h('div.editorContainer@editor', { style: { flex: '1' } }),
     			])
     		])
     	]);
@@ Expand Down @@