From e3ddfbf2b84da0e767ac02be721dcd8155b6143f Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 21 Mar 2021 15:33:20 +1100 Subject: [PATCH] rename function --- pkg/gui/discard_changes_menu_panel.go | 2 +- pkg/gui/files_panel.go | 22 +++++++++++----------- pkg/gui/filtering_menu_panel.go | 2 +- pkg/gui/list_context.go | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/gui/discard_changes_menu_panel.go b/pkg/gui/discard_changes_menu_panel.go index da4e91e18..9499080e2 100644 --- a/pkg/gui/discard_changes_menu_panel.go +++ b/pkg/gui/discard_changes_menu_panel.go @@ -1,7 +1,7 @@ package gui func (gui *Gui) handleCreateDiscardMenu() error { - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node == nil { return nil } diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index ae1531c35..26c3eee49 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -21,7 +21,7 @@ import ( // list panel functions -func (gui *Gui) getSelectedStatusNode() *models.FileChangeNode { +func (gui *Gui) getSelectedFileChangeNode() *models.FileChangeNode { selectedLine := gui.State.Panels.Files.SelectedLineIdx if selectedLine == -1 { return nil @@ -44,7 +44,7 @@ func (gui *Gui) getSelectedFile() *models.File { } func (gui *Gui) getSelectedPath() string { - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node == nil { return "" } @@ -55,7 +55,7 @@ func (gui *Gui) getSelectedPath() string { func (gui *Gui) selectFile(alreadySelected bool) error { gui.getFilesView().FocusPoint(0, gui.State.Panels.Files.SelectedLineIdx) - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node == nil { return gui.refreshMainViews(refreshMainOpts{ @@ -191,7 +191,7 @@ func (gui *Gui) handleEnterFile(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error { - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node == nil { return nil } @@ -220,7 +220,7 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error } func (gui *Gui) handleFilePress() error { - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node == nil { return nil } @@ -295,7 +295,7 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleIgnoreFile() error { - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node == nil { return nil } @@ -493,7 +493,7 @@ func (gui *Gui) editFile(filename string) error { } func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error { - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node == nil { return nil } @@ -506,7 +506,7 @@ func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleFileOpen(g *gocui.Gui, v *gocui.View) error { - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node == nil { return nil } @@ -523,7 +523,7 @@ func (gui *Gui) refreshStateFiles() error { // when we refresh, go looking for a matching name // move the cursor to there. - selectedNode := gui.getSelectedStatusNode() + selectedNode := gui.getSelectedFileChangeNode() prevNodes := gui.State.FileChangeManager.GetAllItems() prevSelectedLineIdx := gui.State.Panels.Files.SelectedLineIdx @@ -819,7 +819,7 @@ func (gui *Gui) handleCreateResetToUpstreamMenu(g *gocui.Gui, v *gocui.View) err } func (gui *Gui) handleToggleDirCollapsed() error { - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node == nil { return nil } @@ -835,7 +835,7 @@ func (gui *Gui) handleToggleDirCollapsed() error { func (gui *Gui) handleToggleFileTreeView() error { // get path of currently selected file - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() path := "" if node != nil { path = node.Path diff --git a/pkg/gui/filtering_menu_panel.go b/pkg/gui/filtering_menu_panel.go index acb808e7e..705e083eb 100644 --- a/pkg/gui/filtering_menu_panel.go +++ b/pkg/gui/filtering_menu_panel.go @@ -15,7 +15,7 @@ func (gui *Gui) handleCreateFilteringMenuPanel(g *gocui.Gui, v *gocui.View) erro fileName := "" switch v.Name() { case "files": - node := gui.getSelectedStatusNode() + node := gui.getSelectedFileChangeNode() if node != nil { fileName = node.Path } diff --git a/pkg/gui/list_context.go b/pkg/gui/list_context.go index 65fac2137..319d7ee40 100644 --- a/pkg/gui/list_context.go +++ b/pkg/gui/list_context.go @@ -279,7 +279,7 @@ func (gui *Gui) filesListContext() *ListContext { return mappedLines }, SelectedItem: func() (ListItem, bool) { - item := gui.getSelectedStatusNode() + item := gui.getSelectedFileChangeNode() return item, item != nil }, }