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

rename function

Browse Source
This commit is contained in:
Jesse Duffield 2021-03-21 15:33:20 +11:00
parent 1ea78c7ae7
commit e3ddfbf2b8
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/discard_changes_menu_panel.go
View File

@ -1,7 +1,7 @@
package gui package gui
func (gui *Gui) handleCreateDiscardMenu() error { func (gui *Gui) handleCreateDiscardMenu() error {
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node == nil { if node == nil {
return nil return nil
} }

22
pkg/gui/files_panel.go
View File

@ -21,7 +21,7 @@ import (
// list panel functions // list panel functions
func (gui *Gui) getSelectedStatusNode() *models.FileChangeNode { func (gui *Gui) getSelectedFileChangeNode() *models.FileChangeNode {
selectedLine := gui.State.Panels.Files.SelectedLineIdx selectedLine := gui.State.Panels.Files.SelectedLineIdx
if selectedLine == -1 { if selectedLine == -1 {
return nil return nil
@ -44,7 +44,7 @@ func (gui *Gui) getSelectedFile() *models.File {
} }
func (gui *Gui) getSelectedPath() string { func (gui *Gui) getSelectedPath() string {
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node == nil { if node == nil {
return "" return ""
} }
@ -55,7 +55,7 @@ func (gui *Gui) getSelectedPath() string {
func (gui *Gui) selectFile(alreadySelected bool) error { func (gui *Gui) selectFile(alreadySelected bool) error {
gui.getFilesView().FocusPoint(0, gui.State.Panels.Files.SelectedLineIdx) gui.getFilesView().FocusPoint(0, gui.State.Panels.Files.SelectedLineIdx)
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node == nil { if node == nil {
return gui.refreshMainViews(refreshMainOpts{ 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 { func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error {
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node == nil { if node == nil {
return nil return nil
} }
@ -220,7 +220,7 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error
} }
func (gui *Gui) handleFilePress() error { func (gui *Gui) handleFilePress() error {
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node == nil { if node == nil {
return nil return nil
} }
@ -295,7 +295,7 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
} }
func (gui *Gui) handleIgnoreFile() error { func (gui *Gui) handleIgnoreFile() error {
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node == nil { if node == nil {
return 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 { func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error {
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node == nil { if node == nil {
return 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 { func (gui *Gui) handleFileOpen(g *gocui.Gui, v *gocui.View) error {
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node == nil { if node == nil {
return nil return nil
} }
@ -523,7 +523,7 @@ func (gui *Gui) refreshStateFiles() error {
// when we refresh, go looking for a matching name // when we refresh, go looking for a matching name
// move the cursor to there. // move the cursor to there.
selectedNode := gui.getSelectedStatusNode() selectedNode := gui.getSelectedFileChangeNode()
prevNodes := gui.State.FileChangeManager.GetAllItems() prevNodes := gui.State.FileChangeManager.GetAllItems()
prevSelectedLineIdx := gui.State.Panels.Files.SelectedLineIdx 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 { func (gui *Gui) handleToggleDirCollapsed() error {
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node == nil { if node == nil {
return nil return nil
} }
@ -835,7 +835,7 @@ func (gui *Gui) handleToggleDirCollapsed() error {
func (gui *Gui) handleToggleFileTreeView() error { func (gui *Gui) handleToggleFileTreeView() error {
// get path of currently selected file // get path of currently selected file
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
path := "" path := ""
if node != nil { if node != nil {
path = node.Path path = node.Path

2
pkg/gui/filtering_menu_panel.go
View File

@ -15,7 +15,7 @@ func (gui *Gui) handleCreateFilteringMenuPanel(g *gocui.Gui, v *gocui.View) erro
fileName := "" fileName := ""
switch v.Name() { switch v.Name() {
case "files": case "files":
node := gui.getSelectedStatusNode() node := gui.getSelectedFileChangeNode()
if node != nil { if node != nil {
fileName = node.Path fileName = node.Path
} }

2
pkg/gui/list_context.go
View File

@ -279,7 +279,7 @@ func (gui *Gui) filesListContext() *ListContext {
return mappedLines return mappedLines
}, },
SelectedItem: func() (ListItem, bool) { SelectedItem: func() (ListItem, bool) {
item := gui.getSelectedStatusNode() item := gui.getSelectedFileChangeNode()
return item, item != nil return item, item != nil
}, },
} }