go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

better handling of cursor relocation

Browse Source
This commit is contained in:
Jesse Duffield
2021-03-21 09:20:52 +11:00
parent d2b65537f6
commit 5edea5a8dc
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/gui/files_panel.go
View File

@ -524,18 +524,8 @@ func (gui *Gui) refreshStateFiles() error {
// move the cursor to there. // move the cursor to there.
selectedNode := gui.getSelectedStatusNode() selectedNode := gui.getSelectedStatusNode()
getPaths := func(node *models.StatusLineNode) []string {
if node == nil {
return nil
}
if node.File != nil && node.File.IsRename() {
return node.File.Names()
} else {
return []string{node.Path}
}
}
selectedPaths := getPaths(selectedNode)
prevNodes := gui.State.StatusLineManager.GetAllItems()
prevSelectedLineIdx := gui.State.Panels.Files.SelectedLineIdx prevSelectedLineIdx := gui.State.Panels.Files.SelectedLineIdx
files := gui.GitCommand.GetStatusFiles(commands.GetStatusFileOptions{}) files := gui.GitCommand.GetStatusFiles(commands.GetStatusFileOptions{})
@ -545,18 +535,39 @@ func (gui *Gui) refreshStateFiles() error {
return err return err
} }
// let's try to find our file again and move the cursor to that // Let's try to find our file again and move the cursor to that.
// If we can't find our file, it was probably just removed by the user. In that
// case, we go looking for where the next file has been moved to. Given that the
// user could have removed a whole directory, we continue iterating through the old
// nodes until we find one that exists in the new set of nodes, then move the cursor
// to that
if selectedNode != nil { if selectedNode != nil {
for idx, node := range gui.State.StatusLineManager.GetAllItems() { getPaths := func(node *models.StatusLineNode) []string {
paths := getPaths(node) if node == nil {
return nil
}
if node.File != nil && node.File.IsRename() {
return node.File.Names()
} else {
return []string{node.Path}
}
}
// If you started off with a rename selected, and now it's broken in two, we want you to jump to the new file, not the old file. outer:
// This is because the new should be in the same position as the rename was meaning less cursor jumping for _, prevNode := range prevNodes[prevSelectedLineIdx:] {
foundOldFileInRename := selectedNode.File != nil && selectedNode.File.IsRename() && node.Path == selectedNode.File.PreviousName selectedPaths := getPaths(prevNode)
selectedNodeHasMoved := idx != prevSelectedLineIdx && utils.StringArraysOverlap(paths, selectedPaths) && !foundOldFileInRename
if selectedNodeHasMoved { for idx, node := range gui.State.StatusLineManager.GetAllItems() {
gui.State.Panels.Files.SelectedLineIdx = idx paths := getPaths(node)
break
// If you started off with a rename selected, and now it's broken in two, we want you to jump to the new file, not the old file.
// This is because the new should be in the same position as the rename was meaning less cursor jumping
foundOldFileInRename := prevNode.File != nil && prevNode.File.IsRename() && node.Path == prevNode.File.PreviousName
foundNode := utils.StringArraysOverlap(paths, selectedPaths) && !foundOldFileInRename
if foundNode {
gui.State.Panels.Files.SelectedLineIdx = idx
break outer
}
} }
} }
} }

4
pkg/gui/status_line_manager.go
View File

@ -41,6 +41,10 @@ func (m *StatusLineManager) GetIndexForPath(path string) (int, bool) {
} }
func (m *StatusLineManager) GetAllItems() []*models.StatusLineNode { func (m *StatusLineManager) GetAllItems() []*models.StatusLineNode {
if m.Tree == nil {
return nil
}
return m.Tree.Flatten(m.CollapsedPaths)[1:] // ignoring root return m.Tree.Flatten(m.CollapsedPaths)[1:] // ignoring root
} }