feat: Implement enhanced diff highlighting.#70
Merged
Conversation
Contributor
|
@sindrets Thanks! |
yorickpeterse
added a commit
to yorickpeterse/nvim-grey
that referenced
this pull request
Mar 15, 2023
See sindrets/diffview.nvim#70 for more details.
yorickpeterse
added a commit
to yorickpeterse/dotfiles
that referenced
this pull request
Mar 16, 2023
Injecting winhl overrides is no longer needed, now that sindrets/diffview.nvim#70 is merged.
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.
Resolves #52.
As pointed out by @yorickpeterse, the way vim highlights diffs isn't the most intuitive when you're comparing only two files (vim has to do it this way of course, because it's the only way that makes sense when you're comparing more than two files). When comparing old state on the left with new state on the right, what vim highlights as an addition on the left, actually represents a deletion.
This PR adds a new option
enhanced_diff_hlthat attempts to tackle this issue. When enabled, a couple new highlighting groups will be generated based on your colorscheme. These will be applied as localwinhlin the diff buffers.Before:
After: