Skip to content

Commit 54cec36

Browse files
committed
setting the sticky scroll to be disabled when inside of an inline diff
1 parent 374e02f commit 54cec36

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/vs/editor/browser/widget/diffEditorWidget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1287,6 +1287,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
12871287
// never wrap hidden editor
12881288
result.wordWrapOverride1 = 'off';
12891289
result.wordWrapOverride2 = 'off';
1290+
result.stickyScroll = { enabled: false };
12901291
} else {
12911292
result.wordWrapOverride1 = this._options.diffWordWrap;
12921293
}
@@ -1297,7 +1298,6 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
12971298
result.readOnly = !this._options.originalEditable;
12981299
result.dropIntoEditor = { enabled: !result.readOnly };
12991300
result.extraEditorClassName = 'original-in-monaco-diff-editor';
1300-
result.stickyScroll = { enabled: false };
13011301
return {
13021302
...result,
13031303
dimension: {

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
281281
// never wrap hidden editor
282282
result.wordWrapOverride1 = 'off';
283283
result.wordWrapOverride2 = 'off';
284+
result.stickyScroll = { enabled: false };
284285
} else {
285286
result.wordWrapOverride1 = this._options.get().diffWordWrap;
286287
}
@@ -291,7 +292,6 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
291292
result.readOnly = !options.originalEditable;
292293
result.dropIntoEditor = { enabled: !result.readOnly };
293294
result.extraEditorClassName = 'original-in-monaco-diff-editor';
294-
result.stickyScroll = { enabled: false };
295295
return result;
296296
}
297297

0 commit comments

Comments
 (0)