diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index 36da5f0b527..aaac8ddb1e0 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -1287,6 +1287,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE // never wrap hidden editor result.wordWrapOverride1 = 'off'; result.wordWrapOverride2 = 'off'; + result.stickyScroll = { enabled: false }; } else { result.wordWrapOverride1 = this._options.diffWordWrap; } @@ -1297,7 +1298,6 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE result.readOnly = !this._options.originalEditable; result.dropIntoEditor = { enabled: !result.readOnly }; result.extraEditorClassName = 'original-in-monaco-diff-editor'; - result.stickyScroll = { enabled: false }; return { ...result, dimension: { diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts index a430d7b707e..1cde4ba424e 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts @@ -281,6 +281,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor { // never wrap hidden editor result.wordWrapOverride1 = 'off'; result.wordWrapOverride2 = 'off'; + result.stickyScroll = { enabled: false }; } else { result.wordWrapOverride1 = this._options.get().diffWordWrap; } @@ -291,7 +292,6 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor { result.readOnly = !options.originalEditable; result.dropIntoEditor = { enabled: !result.readOnly }; result.extraEditorClassName = 'original-in-monaco-diff-editor'; - result.stickyScroll = { enabled: false }; return result; }