fix(scene): fix range selection freeze in :DiffviewFileHistory#44
Merged
dlyongemallo merged 2 commits intomainfrom Mar 16, 2026
Merged
fix(scene): fix range selection freeze in :DiffviewFileHistory#44dlyongemallo merged 2 commits intomainfrom
:DiffviewFileHistory#44dlyongemallo merged 2 commits intomainfrom
Conversation
Setting foldmethod=manual on diff windows triggers a Neovim bug where the screen redraw enters an infinite loop for certain buffer pairs. This permanently freezes the editor. Fixes sindrets#552
There was a problem hiding this comment.
Pull request overview
Removes the “custom diff patch folds” feature used in File History line-tracing diffs and adjusts window behavior to avoid a Neovim infinite-redraw freeze scenario when diff=true is combined with foldmethod=manual.
Changes:
- Removed custom fold data/modeling (
custom_folds) fromvcs.Fileand deleted the related fold-application logic fromWindow. - Removed patch-hunk-derived fold generation (
update_patch_folds/has_patch_folds) and the File History codepath that enabledfoldmethod=manualfor line-tracing. - Improved File History “file opened” behavior to jump to the first diff hunk and center the view.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| lua/diffview/vcs/file.lua | Removes custom_folds type/docs from the vcs.File model. |
| lua/diffview/scene/window.lua | Deletes apply_custom_folds and stops calling it on window open. |
| lua/diffview/scene/views/file_history/listeners.lua | Uses nvim_win_call to move cursor, jump to first hunk, and center after opening a file. |
| lua/diffview/scene/views/file_history/file_history_view.lua | Removes foldmethod=manual + patch-fold logic; adds note about Neovim freeze bug and relies on foldmethod=diff. |
| lua/diffview/scene/file_entry.lua | Removes patch-fold generation and detection helpers. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
No description provided.