fix: restore word wrap after diff editor inline to split-view transition#314903
Open
heliole wants to merge 3 commits intomicrosoft:mainfrom
Open
fix: restore word wrap after diff editor inline to split-view transition#314903heliole wants to merge 3 commits intomicrosoft:mainfrom
heliole wants to merge 3 commits intomicrosoft:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a diff editor layout transition bug where word wrap could remain disabled after switching from inline to side-by-side mode, by resetting wordWrapOverride2 so diffEditor.wordWrap can take effect again.
Changes:
- Reset
wordWrapOverride2to'inherit'when updating sub-editor options so stale inline-mode overrides don’t keep winning. - Apply the reset for both original (left) and modified (right) sub-editors during option recomputation.
Comment on lines
148
to
152
| } else { | ||
| result.unicodeHighlight = this._options.editorOptions.get().unicodeHighlight || {}; | ||
| result.wordWrapOverride1 = this._options.diffWordWrap.get(); | ||
| result.wordWrapOverride2 = 'inherit'; | ||
| } |
Author
|
I apologize for the mistake. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #314898
Summary
Fixes diff editor word wrap when resizing from inline to side-by-side mode by clearing the stale wordWrapOverride2 override so
diffEditor.wordWrapis honored.