feat: fold unchanged inline diff regions - #310
Open
princejoogie wants to merge 1 commit into
Open
Conversation
Use expression folds so edits can recompute visible hunk context without rebuilding manual folds. Keep pure-deletion anchors open so deleted virtual lines remain visible.
| -- `_repaint`. | ||
| local new_lines = self.b.file.nulled and {} or api.nvim_buf_get_lines(bufnr, 0, -1, false) | ||
| inline_diff.render(bufnr, old_lines, new_lines, render_opts(self.b.id)) | ||
| self:_update_folds() |
Owner
There was a problem hiding this comment.
Isn't this going to cause conflicts with user-initiated manual folds? If the user does zo, on the next _repaint this call applies zX and closes their fold.
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
2 participants
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.
Adds an opt-in
view.inline.fold_unchangedsetting fordiff1_inline, using the context fromdiffoptand the configuredview.foldlevel.This uses
foldmethod=exprinstead of manual folds so edits and renderer repaints can recompute fold boundaries from the current hunks. Pure-deletion anchors stay at fold level 0, which keeps their deletedvirt_linesvisible.Tests:
jjandhgare not installed