Skip to content

Commit dbeea39

Browse files
authored
Merge pull request microsoft#184061 from microsoft/aiday/issue180711
Not showing sticky widget on the left editor of inline diff
2 parents 67bccd3 + 54cec36 commit dbeea39

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,6 +1288,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
12881288
// never wrap hidden editor
12891289
result.wordWrapOverride1 = 'off';
12901290
result.wordWrapOverride2 = 'off';
1291+
result.stickyScroll = { enabled: false };
12911292
} else {
12921293
result.wordWrapOverride1 = this._options.diffWordWrap;
12931294
}

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

Lines changed: 1 addition & 0 deletions
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
}

0 commit comments

Comments
 (0)