sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

use generics to DRY up context code

Browse Source
This commit is contained in:
Jesse Duffield
2022-03-19 09:31:52 +11:00
parent 4b56d428ff
commit d93fef4c61
31 changed files with 117 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers/commits_files_controller.go
View File

@ -80,7 +80,7 @@ func (self *CommitFilesController) GetMouseKeybindings(opts types.KeybindingsOpt
func (self *CommitFilesController) checkSelected(callback func(*filetree.CommitFileNode) error) func() error {
return func() error {
selected := self.context().GetSelectedFileNode()
selected := self.context().GetSelected()
if selected == nil {
return nil
}
@ -98,7 +98,7 @@ func (self *CommitFilesController) context() *context.CommitFilesContext {
}
func (self *CommitFilesController) onClickMain(opts gocui.ViewMouseBindingOpts) error {
node := self.context().GetSelectedFileNode()
node := self.context().GetSelected()
if node == nil {
return nil
}

10
pkg/gui/controllers/files_controller.go
View File

@ -216,7 +216,7 @@ func (self *FilesController) press(node *filetree.FileNode) error {
func (self *FilesController) checkSelectedFileNode(callback func(*filetree.FileNode) error) func() error {
return func() error {
node := self.context().GetSelectedFileNode()
node := self.context().GetSelected()
if node == nil {
return nil
}
@ -234,7 +234,7 @@ func (self *FilesController) context() *context.WorkingTreeContext {
}
func (self *FilesController) getSelectedFile() *models.File {
node := self.context().GetSelectedFileNode()
node := self.context().GetSelected()
if node == nil {
return nil
}
@ -246,7 +246,7 @@ func (self *FilesController) enter() error {
}
func (self *FilesController) EnterFile(opts types.OnFocusOpts) error {
node := self.context().GetSelectedFileNode()
node := self.context().GetSelected()
if node == nil {
return nil
}
@ -535,7 +535,7 @@ func (self *FilesController) edit(node *filetree.FileNode) error {
}
func (self *FilesController) Open() error {
node := self.context().GetSelectedFileNode()
node := self.context().GetSelected()
if node == nil {
return nil
}
@ -583,7 +583,7 @@ func (self *FilesController) createResetToUpstreamMenu() error {
}
func (self *FilesController) handleToggleDirCollapsed() error {
node := self.context().GetSelectedFileNode()
node := self.context().GetSelected()
if node == nil {
return nil
}

2
pkg/gui/controllers/files_remove_controller.go
View File

@ -139,7 +139,7 @@ func (self *FilesRemoveController) ResetSubmodule(submodule *models.SubmoduleCon
func (self *FilesRemoveController) checkSelectedFileNode(callback func(*filetree.FileNode) error) func() error {
return func() error {
node := self.context().GetSelectedFileNode()
node := self.context().GetSelected()
if node == nil {
return nil
}

6
pkg/gui/controllers/list_controller.go
View File

@ -83,11 +83,11 @@ func (self *ListController) HandleNextPage() error {
}
func (self *ListController) HandleGotoTop() error {
return self.handleLineChange(-self.context.GetList().GetItemsLength())
return self.handleLineChange(-self.context.GetList().Len())
}
func (self *ListController) HandleGotoBottom() error {
return self.handleLineChange(self.context.GetList().GetItemsLength())
return self.handleLineChange(self.context.GetList().Len())
}
func (self *ListController) HandleClick(opts gocui.ViewMouseBindingOpts) error {
@ -99,7 +99,7 @@ func (self *ListController) HandleClick(opts gocui.ViewMouseBindingOpts) error {
return err
}
if newSelectedLineIdx > self.context.GetList().GetItemsLength()-1 {
if newSelectedLineIdx > self.context.GetList().Len()-1 {
return nil
}

2
pkg/gui/controllers/local_commits_controller.go
View File

@ -588,7 +588,7 @@ func (self *LocalCommitsController) gotoBottom() error {
}
}
self.context().SetSelectedLineIdx(self.context().GetItemsLength() - 1)
self.context().SetSelectedLineIdx(self.context().Len() - 1)
return nil
}