From 2bb40a25d17c01cc3d76e21a2c17fbaa6180cedb Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Thu, 21 Mar 2024 22:20:35 -0700
Subject: [PATCH] Re #208345. Render side by side all the time in notebook diff
 editor (#208355)

---
 .../contrib/notebook/browser/diff/diffCellEditorOptions.ts    | 2 ++
 .../contrib/notebook/browser/diff/notebookDiffList.ts         | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts
index 745b141de35..c2b1d9cf252 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts
@@ -50,4 +50,6 @@ export const fixedDiffEditorOptions: IDiffEditorConstructionOptions = {
 	wordWrap: 'off',
 	diffWordWrap: 'off',
 	diffAlgorithm: 'advanced',
+	renderSideBySide: true,
+	useInlineViewWhenSpaceIsLimited: false
 };
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
index 4e92fa8a42f..a3cfecd2a6f 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
@@ -248,7 +248,9 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 			dimension: {
 				height: 0,
 				width: 0
-			}
+			},
+			renderSideBySide: true,
+			useInlineViewWhenSpaceIsLimited: false
 		}, {
 			originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
 			modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()