Keep current file selected after staging #1760
Open
Conversation
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
|
I'm going to do my best to review all your PR's soon, just bear in mind I have three kids, two of which are six months old 😅 |
|
No worries! Take your time, I know how demanding twins can be. |
CKolkey
reviewed
Jun 11, 2025
| @@ -18,23 +17,33 @@ local function get_local_diff_view(section_name, item_name, opts) | |||
| section_name = "working" | |||
| end | |||
|
|
|||
| local function update_files() | |||
| local function update_files(current_file_path) | |||
There was a problem hiding this comment.
it looks like this argument will always be nil? I don't see any callers passing it.
Comment on lines
+23
to
+31
| git.repo:dispatch_refresh { | ||
| source = "diffview_update", | ||
| callback = function() end, | ||
| } | ||
|
|
||
| local repo_state = git.repo.state | ||
| if not repo_state then | ||
| return files | ||
| end |
There was a problem hiding this comment.
Not sure about this - the git repo should always have state at this point. How would you get here with an uninitialized repository?
Comment on lines
+98
to
+102
| view:on_files_staged(function() | ||
| vim.schedule(function() | ||
| Watcher.instance():dispatch_refresh() | ||
| end) | ||
| end) |
There was a problem hiding this comment.
Can you explain why this needs to be scheduled, instead of non-blocking async? Not sure I follow.
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.
This PR fixes #1448 where Diffview would jump back to the first file after saving.
To fix this in Neogit, I've updated the Diffview integration:
update_files, which then uses it to ensure the correct file remains selected.Note on a related Diffview issue:
I also noticed that Diffview itself doesn't always handle writing edits to staged files correctly (changes made in the diff view to a staged file might not reflect in the worktree, appearing lost on refresh). I've fixed this in my fork of Diffview.