Fix diff viewer scroll sync and add context folding#121
Merged
actionshrimp merged 1 commit intomainfrom Mar 8, 2026
Merged
Conversation
Scroll sync was janky because scrollbind stayed active during content
replacement (causing windows to fight each other), cursor positions
weren't reset between file switches, and there was no recovery from
mouse-scroll-induced desync.
Fixes:
- Suspend scrollbind during content update, reset cursors to {1,0},
then re-enable with deferred syncbind via vim.schedule
- Add BufEnter autocmd on diff buffers to re-sync scrollbind when
focusing a window (recovers from mouse scroll on inactive window)
- Apply same fixes to both 2-pane and 3-pane buffer modules
Also adds context folding to 2-pane diffs (previously only 3-pane had
this): large context-only regions are folded with 3 lines of context
shown around each change, matching the existing 3-way behavior.
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.
Summary
vim.scheduleto let pending buffer operations settleTest plan
compute_fold_rangescovering: empty input, all-changes input, inter-hunk folding, leading context, trailing context, custom context_lines, single-line gap rejection