fix(scrollsync): prevent TreeSitter follower redraws from moving the active cursor - #517
Closed
richardgill wants to merge 3 commits into
Closed
Conversation
richardgill
marked this pull request as ready for review
August 3, 2026 19:09
Collaborator
Author
|
Closing in favor of #518, which tracks the underlying TreeSitter/virt_lines follower-view problem and includes the deterministic reproduction and before video. This PR mitigated the cursor jump but was not a complete solution to the underlying redraw correction. |
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.
Summary
Prevent TreeSitter redraws in a virtual follower buffer from moving the active cursor during structural scroll synchronization, while keeping the follower aligned as it leaves a full-screen filler block.
Root cause
CodeDiff records the expected view after programmatically scrolling a follower pane. TreeSitter can then correct the virtual buffer's final view while rendering a tall
virt_linesfiller block. The resultingWinScrolledecho previously looked like independent follower scrolling, so CodeDiff promoted that pane to leader and synchronized its clamped position back to the active pane.An exact follower correction can also be displaced by local
scrolloffbefore the redraw echo arrives, briefly exposing unrelated baseline text.The regression was introduced by #471, which added structural scroll synchronization.
Changes
WinScrolledevent arrives.v:eventand the callback match to consume only the relevant follower echo.scrolloffduring exact filler alignment, then restore it on redraw, resume, refresh, or teardown.Benefits
Demonstration
Before
before.mp4
After
after.mp4