Ensure word-wrap respected when diff editors side by side #15161
Conversation
59a0c53 to
3368338
Compare
3368338 to
8a4c2da
Compare
There was a problem hiding this comment.
Works for me!
Note that there is a related minor issue which I found: When a diff editor is open and we switch the word wrap preference, then the editor reacts accordingly, however the diff markers are then gone afterwards.
If it makes sense you could fix the issue here too or we create a follow up ticket.
It doesn't appear to have to do with toggling the word wrap preference, but with hiding the editor. If you use Alt + Z to toggle the preference, or put the preference view in a different tab bar and then open the diff editor and then use the preference view to change the preference, the editor reacts correctly, and if you hide the editor in any way and then show it again without doing anything else, the diff markers are gone. I suspect that this is has to do with @tsmaeder's recent changes to set and unset the model when an editor is hidden, so I'll create a follow up ticket. |
What it does
Fixes #15105
See also microsoft/vscode#217386 (comment)
Adds code to ensure that the
wordWrapOverride2setting is explicitly cleared when a diff editor is large enough for side-by-side rendering.How to test
wordWrappreference totrueand open a diff editor.Follow-ups
Breaking changes
Attribution
Review checklist
Reminder for reviewers