From 709d1b879a21625eddf200464eaed48d8aeb7a23 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Mon, 22 Jul 2024 20:47:53 +0200 Subject: [PATCH] Fixes diff editor rendering bug --- src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts index 565609e24c416..9b4d756fa895b 100644 --- a/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts +++ b/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts @@ -71,7 +71,9 @@ export class DiffEditorOptions { public readonly showEmptyDecorations = derived(this, reader => this._options.read(reader).experimental.showEmptyDecorations!); public readonly onlyShowAccessibleDiffViewer = derived(this, reader => this._options.read(reader).onlyShowAccessibleDiffViewer); public readonly compactMode = derived(this, reader => this._options.read(reader).compactMode); - public readonly useTrueInlineDiffRendering = derived(this, reader => this._options.read(reader).experimental.useTrueInlineView!); + public readonly useTrueInlineDiffRendering: IObservable = derived(this, reader => + !this.renderSideBySide.read(reader) && this._options.read(reader).experimental.useTrueInlineView! + ); public readonly hideUnchangedRegions = derived(this, reader => this._options.read(reader).hideUnchangedRegions.enabled!); public readonly hideUnchangedRegionsRevealLineCount = derived(this, reader => this._options.read(reader).hideUnchangedRegions.revealLineCount!);