fix: sort get_nav_hunks to handle mixed hunk states #1114
Merged
Conversation
This file contains 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
lewis6991
reviewed
Aug 24, 2024
lua/gitsigns/actions.lua
Outdated
| @@ -573,6 +573,9 @@ local function get_nav_hunks(bufnr, target, greedy) | |||
| hunks = hunks_head | |||
| end | |||
| end | |||
| table.sort(hunks, function(h1, h2) | |||
There was a problem hiding this comment.
I think this can moved to below line 571.
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.
Fixes #1113
gitsigns.hunks.find_nearest_hunk's algorithm only works on a sorted list of hunks (because it returnsi+1which it assumes is the next hunk), howeverget_nav_hunksdid not return the list of hunks sorted.So
get_nav_hunksmight return a list with lines 16, 29, 24 (staged hunks appended to unstaged); then when jumping from 16 to the next hunk, it would find and jump to 29 when you would expect it to find the hunk at line 24.I'm not familiar with the codebase, but this does not look like it will break anything else.
find_nearest_hunkis only used innav_hunk.