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

Remove return value of RenderToMainViews and some related functions

Browse Source
This commit is contained in:
Stefan Haller
2024-09-04 13:42:03 +02:00
parent b91beb68e1
commit 5446683881
29 changed files with 109 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,13 +224,13 @@ func (self *FilesController) GetMouseKeybindings(opts types.KeybindingsOpts) []*
}
}
func (self *FilesController) GetOnRenderToMain() func() error {
return func() error {
return self.c.Helpers().Diff.WithDiffModeCheck(func() error {
func (self *FilesController) GetOnRenderToMain() func() {
return func() {
self.c.Helpers().Diff.WithDiffModeCheck(func() {
node := self.context().GetSelected()
if node == nil {
return self.c.RenderToMainViews(types.RefreshMainOpts{
self.c.RenderToMainViews(types.RefreshMainOpts{
Pair: self.c.MainViewPairs().Normal,
Main: &types.ViewUpdateOpts{
Title: self.c.Tr.DiffTitle,
@ -238,16 +238,18 @@ func (self *FilesController) GetOnRenderToMain() func() error {
Task: types.NewRenderStringTask(self.c.Tr.NoChangedFiles),
},
})
return
}
if node.File != nil && node.File.HasInlineMergeConflicts {
hasConflicts, err := self.c.Helpers().MergeConflicts.SetMergeState(node.GetPath())
if err != nil {
return err
return
}
if hasConflicts {
return self.c.Helpers().MergeConflicts.Render()
self.c.Helpers().MergeConflicts.Render()
return
}
}
@ -290,7 +292,7 @@ func (self *FilesController) GetOnRenderToMain() func() error {
}
}
return self.c.RenderToMainViews(refreshOpts)
self.c.RenderToMainViews(refreshOpts)
})
}
}