follow cursor when staging and unstaging a file rename

1 files changed, 14 insertions, 1 deletions

diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index 6cba05715..0c6d2c9f3 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -410,14 +410,27 @@ func (gui *Gui) handleRefreshFiles(g *gocui.Gui, v *gocui.View) error {
 }
 
 func (gui *Gui) refreshStateFiles() error {
+	// keep track of where the cursor is currently and the current file names
+	// when we refresh, go looking for a matching name
+	// move the cursor to there.
+	selectedFile, _ := gui.getSelectedFile()
+
 	// get files to stage
 	files := gui.GitCommand.GetStatusFiles(commands.GetStatusFileOptions{})
-	gui.State.Files = gui.GitCommand.MergeStatusFiles(gui.State.Files, files)
+	gui.State.Files = gui.GitCommand.MergeStatusFiles(gui.State.Files, files, selectedFile)
 
 	if err := gui.fileWatcher.addFilesToFileWatcher(files); err != nil {
 		return err
 	}
 
+	// let's try to find our file again and move the cursor to that
+	for idx, f := range gui.State.Files {
+		if selectedFile != nil && f.Matches(selectedFile) {
+			gui.State.Panels.Files.SelectedLine = idx
+			break
+		}
+	}
+
 	gui.refreshSelectedLine(&gui.State.Panels.Files.SelectedLine, len(gui.State.Files))
 	return nil
 }