feat(diff): honor diffopt inline granularity - #433
Merged
Conversation
## Problem 'diffopt' `inline:` decides how much of a changed line Neovim emphasizes, and `inline:char` ships in the default. diffs.nvim ignored it, so its surfaces disagreed with native diff windows and word-level emphasis was unreachable. ## Solution Resolve `inline:` with the other 'diffopt' facets and reshape intra-line spans to it: `none` skips the work, `simple` spans first to last difference, `char` is unchanged, `word` grows spans to word boundaries and merges gaps of five bytes or less. A missing value resolves to `simple`, as Neovim does. The existing `OptionSet` repaint carries it live, so no mapping or option is added.
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
1 participant
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.
Problem
'diffopt'
inline:decides how much of a changed line Neovim emphasizes, andinline:charships in the default. diffs.nvim ignored it, so its surfacesdisagreed with native diff windows and word-level emphasis was unreachable.
Solution
Resolve
inline:with the other 'diffopt' facets and reshape intra-line spansto it:
noneskips the work,simplespans first to last difference,charis unchanged,
wordgrows spans to word boundaries and merges gaps of fivebytes or less. A missing value resolves to
simple, as Neovim does. Theexisting
OptionSetrepaint carries it live, so no mapping or option is added.