mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 12:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove return value of IPatchExplorerContext.Render, RenderAndFocus, and NavigateTo

Browse source
This commit is contained in:
Stefan Haller 2024-09-04 13:57:01 +02:00
parent 5446683881
commit 8edcd71234
6 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/gui/context/merge_conflicts_context.go
View file

@ -68,13 +68,11 @@ func (self *MergeConflictsContext) IsUserScrolling() bool {
return self.viewModel.userVerticalScrolling
}
func (self *MergeConflictsContext) RenderAndFocus() error {
func (self *MergeConflictsContext) RenderAndFocus() {
self.setContent()
self.FocusSelection()
self.c.Render()
return nil
}
func (self *MergeConflictsContext) Render() error {

15
pkg/gui/context/patch_explorer_context.go
View file

@ -53,7 +53,8 @@ func NewPatchExplorerContext(
func(selectedLineIdx int) error {
ctx.GetMutex().Lock()
defer ctx.GetMutex().Unlock()
return ctx.NavigateTo(ctx.c.Context().IsCurrent(ctx), selectedLineIdx)
ctx.NavigateTo(ctx.c.Context().IsCurrent(ctx), selectedLineIdx)
return nil
}),
)
@ -78,21 +79,17 @@ func (self *PatchExplorerContext) GetIncludedLineIndices() []int {
return self.getIncludedLineIndices()
}
func (self *PatchExplorerContext) RenderAndFocus(isFocused bool) error {
func (self *PatchExplorerContext) RenderAndFocus(isFocused bool) {
self.setContent(isFocused)
self.FocusSelection()
self.c.Render()
return nil
}
func (self *PatchExplorerContext) Render(isFocused bool) error {
func (self *PatchExplorerContext) Render(isFocused bool) {
self.setContent(isFocused)
self.c.Render()
return nil
}
func (self *PatchExplorerContext) Focus() error {
@ -132,11 +129,11 @@ func (self *PatchExplorerContext) GetContentToRender(isFocused bool) string {
return self.GetState().RenderForLineIndices(isFocused, self.GetIncludedLineIndices())
}
func (self *PatchExplorerContext) NavigateTo(isFocused bool, selectedLineIdx int) error {
func (self *PatchExplorerContext) NavigateTo(isFocused bool, selectedLineIdx int) {
self.GetState().SetLineSelectMode()
self.GetState().SelectLine(selectedLineIdx)
return self.RenderAndFocus(isFocused)
self.RenderAndFocus(isFocused)
}
func (self *PatchExplorerContext) GetMutex() *deadlock.Mutex {

3
pkg/gui/controllers/merge_conflicts_controller.go
View file

@ -329,7 +329,8 @@ func (self *MergeConflictsController) withRenderAndFocus(f func() error) func()
return err
}
return self.context().RenderAndFocus()
self.context().RenderAndFocus()
return nil
})
}

3
pkg/gui/controllers/patch_explorer_controller.go
View file

@ -300,7 +300,8 @@ func (self *PatchExplorerController) withRenderAndFocus(f func() error) func() e
return err
}
return self.context.RenderAndFocus(self.isFocused())
self.context.RenderAndFocus(self.isFocused())
return nil
})
}

4
pkg/gui/controllers/staging_controller.go
View file

@ -133,8 +133,8 @@ func (self *StagingController) GetOnFocusLost() func(types.OnFocusLostOpts) erro
if opts.NewContextKey != self.otherContext.GetKey() {
self.c.Views().Staging.Wrap = true
self.c.Views().StagingSecondary.Wrap = true
_ = self.c.Contexts().Staging.Render(false)
_ = self.c.Contexts().StagingSecondary.Render(false)
self.c.Contexts().Staging.Render(false)
self.c.Contexts().StagingSecondary.Render(false)
}
return nil
}

6
pkg/gui/types/context.go
View file

@ -177,11 +177,11 @@ type IPatchExplorerContext interface {
GetState() *patch_exploring.State
SetState(*patch_exploring.State)
GetIncludedLineIndices() []int
RenderAndFocus(isFocused bool) error
Render(isFocused bool) error
RenderAndFocus(isFocused bool)
Render(isFocused bool)
Focus() error
GetContentToRender(isFocused bool) string
NavigateTo(isFocused bool, selectedLineIdx int) error
NavigateTo(isFocused bool, selectedLineIdx int)
GetMutex() *deadlock.Mutex
IsPatchExplorerContext() // used for type switch
}