Skip to content

Commit 38a7fcd

Browse files
committed
1 parent 9219bf5 commit 38a7fcd

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ export class DiffEditorOptions {
7171
public readonly showEmptyDecorations = derived(this, reader => this._options.read(reader).experimental.showEmptyDecorations!);
7272
public readonly onlyShowAccessibleDiffViewer = derived(this, reader => this._options.read(reader).onlyShowAccessibleDiffViewer);
7373
public readonly compactMode = derived(this, reader => this._options.read(reader).compactMode);
74+
private readonly trueInlineDiffRenderingEnabled: IObservable<boolean> = derived(this, reader =>
75+
this._options.read(reader).experimental.useTrueInlineView!
76+
);
77+
7478
public readonly useTrueInlineDiffRendering: IObservable<boolean> = derived(this, reader =>
75-
!this.renderSideBySide.read(reader) && this._options.read(reader).experimental.useTrueInlineView!
79+
!this.renderSideBySide.read(reader) && this.trueInlineDiffRenderingEnabled.read(reader)
7680
);
7781

7882
public readonly hideUnchangedRegions = derived(this, reader => this._options.read(reader).hideUnchangedRegions.enabled!);
@@ -99,7 +103,7 @@ export class DiffEditorOptions {
99103
private readonly shouldRenderInlineViewInSmartMode = this._model
100104
.map(this, model => derivedConstOnceDefined(this, reader => {
101105
const diffs = model?.diff.read(reader);
102-
return diffs ? isSimpleDiff(diffs, this.useTrueInlineDiffRendering.read(reader)) : undefined;
106+
return diffs ? isSimpleDiff(diffs, this.trueInlineDiffRenderingEnabled.read(reader)) : undefined;
103107
}))
104108
.flatten()
105109
.map(this, v => !!v);

0 commit comments

Comments
 (0)