mirror of
https://github.com/Microsoft/vscode
synced 2024-10-05 19:02:54 +00:00
Merge pull request #184061 from microsoft/aiday/issue180711
Not showing sticky widget on the left editor of inline diff
This commit is contained in:
commit
dbeea39df4
|
@ -1288,6 +1288,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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue