Remove return value of HandleRender

This commit is contained in:
Stefan Haller 2024-09-04 13:17:33 +02:00
parent 5659f1f3e9
commit b91beb68e1
14 changed files with 25 additions and 40 deletions

View file

@ -49,7 +49,7 @@ func (self *ListContextTrait) FocusLine() {
} else if self.renderOnlyVisibleLines { } else if self.renderOnlyVisibleLines {
newOrigin, _ := self.GetViewTrait().ViewPortYBounds() newOrigin, _ := self.GetViewTrait().ViewPortYBounds()
if oldOrigin != newOrigin { if oldOrigin != newOrigin {
return self.HandleRender() self.HandleRender()
} }
} }
return nil return nil
@ -91,7 +91,7 @@ func (self *ListContextTrait) HandleFocusLost(opts types.OnFocusLostOpts) error
} }
// OnFocus assumes that the content of the context has already been rendered to the view. OnRender is the function which actually renders the content to the view // OnFocus assumes that the content of the context has already been rendered to the view. OnRender is the function which actually renders the content to the view
func (self *ListContextTrait) HandleRender() error { func (self *ListContextTrait) HandleRender() {
self.list.ClampSelection() self.list.ClampSelection()
if self.renderOnlyVisibleLines { if self.renderOnlyVisibleLines {
// Rendering only the visible area can save a lot of cell memory for // Rendering only the visible area can save a lot of cell memory for
@ -110,8 +110,6 @@ func (self *ListContextTrait) HandleRender() error {
} }
self.c.Render() self.c.Render()
self.setFooter() self.setFooter()
return nil
} }
func (self *ListContextTrait) OnSearchSelect(selectedLineIdx int) error { func (self *ListContextTrait) OnSearchSelect(selectedLineIdx int) error {

View file

@ -60,8 +60,7 @@ func (self *SimpleContext) HandleFocusLost(opts types.OnFocusLostOpts) error {
return nil return nil
} }
func (self *SimpleContext) HandleRender() error { func (self *SimpleContext) HandleRender() {
return nil
} }
func (self *SimpleContext) HandleRenderToMain() error { func (self *SimpleContext) HandleRenderToMain() error {

View file

@ -70,7 +70,7 @@ func (self *SuggestionsContext) SetSuggestions(suggestions []*types.Suggestion)
self.State.Suggestions = suggestions self.State.Suggestions = suggestions
self.SetSelection(0) self.SetSelection(0)
self.c.ResetViewOrigin(self.GetView()) self.c.ResetViewOrigin(self.GetView())
_ = self.HandleRender() self.HandleRender()
} }
func (self *SuggestionsContext) RefreshSuggestions() { func (self *SuggestionsContext) RefreshSuggestions() {

View file

@ -734,9 +734,7 @@ func (self *BranchesController) rename(branch *models.Branch) error {
for i, newBranch := range self.c.Model().Branches { for i, newBranch := range self.c.Model().Branches {
if newBranch.Name == newBranchName { if newBranch.Name == newBranchName {
self.context().SetSelection(i) self.context().SetSelection(i)
if err := self.context().HandleRender(); err != nil { self.context().HandleRender()
return err
}
} }
} }

View file

@ -366,7 +366,7 @@ func (self *ConfirmationHelper) layoutMenuPrompt(contentWidth int) int {
// We need to rerender to give the menu context a chance to update its // We need to rerender to give the menu context a chance to update its
// non-model items, and reinitialize the data it uses for converting // non-model items, and reinitialize the data it uses for converting
// between view index and model index. // between view index and model index.
_ = self.c.Contexts().Menu.HandleRender() self.c.Contexts().Menu.HandleRender()
// Then we need to refocus to ensure the cursor is in the right place in // Then we need to refocus to ensure the cursor is in the right place in
// the view. // the view.

View file

@ -151,7 +151,7 @@ func (self *InlineStatusHelper) stop(opts InlineStatusOpts) {
func (self *InlineStatusHelper) renderContext(contextKey types.ContextKey) { func (self *InlineStatusHelper) renderContext(contextKey types.ContextKey) {
self.c.OnUIThread(func() error { self.c.OnUIThread(func() error {
_ = self.c.ContextForKey(contextKey).HandleRender() self.c.ContextForKey(contextKey).HandleRender()
return nil return nil
}) })
} }

View file

@ -469,9 +469,7 @@ func (self *RefreshHelper) refreshBranches(refreshWorktrees bool, keepBranchSele
}, },
func() { func() {
self.c.OnUIThread(func() error { self.c.OnUIThread(func() error {
if err := self.c.Contexts().Branches.HandleRender(); err != nil { self.c.Contexts().Branches.HandleRender()
self.c.Log.Error(err)
}
self.refreshStatus() self.refreshStatus()
return nil return nil
}) })
@ -504,9 +502,7 @@ func (self *RefreshHelper) refreshBranches(refreshWorktrees bool, keepBranchSele
// Need to re-render the commits view because the visualization of local // Need to re-render the commits view because the visualization of local
// branch heads might have changed // branch heads might have changed
self.c.Mutexes().LocalCommitsMutex.Lock() self.c.Mutexes().LocalCommitsMutex.Lock()
if err := self.c.Contexts().LocalCommits.HandleRender(); err != nil { self.c.Contexts().LocalCommits.HandleRender()
self.c.Log.Error(err)
}
self.c.Mutexes().LocalCommitsMutex.Unlock() self.c.Mutexes().LocalCommitsMutex.Unlock()
self.refreshStatus() self.refreshStatus()

View file

@ -78,7 +78,7 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
// offer to autostash changes // offer to autostash changes
self.c.OnUIThread(func() error { self.c.OnUIThread(func() error {
// (Before showing the prompt, render again to remove the inline status) // (Before showing the prompt, render again to remove the inline status)
_ = self.c.Contexts().Branches.HandleRender() self.c.Contexts().Branches.HandleRender()
return self.c.Confirm(types.ConfirmOpts{ return self.c.Confirm(types.ConfirmOpts{
Title: self.c.Tr.AutoStashTitle, Title: self.c.Tr.AutoStashTitle,
Prompt: self.c.Tr.AutoStashPrompt, Prompt: self.c.Tr.AutoStashPrompt,

View file

@ -54,7 +54,7 @@ func (self *ListController) HandleScrollUp() error {
scrollHeight := self.c.UserConfig().Gui.ScrollHeight scrollHeight := self.c.UserConfig().Gui.ScrollHeight
self.context.GetViewTrait().ScrollUp(scrollHeight) self.context.GetViewTrait().ScrollUp(scrollHeight)
if self.context.RenderOnlyVisibleLines() { if self.context.RenderOnlyVisibleLines() {
return self.context.HandleRender() self.context.HandleRender()
} }
return nil return nil
@ -64,7 +64,7 @@ func (self *ListController) HandleScrollDown() error {
scrollHeight := self.c.UserConfig().Gui.ScrollHeight scrollHeight := self.c.UserConfig().Gui.ScrollHeight
self.context.GetViewTrait().ScrollDown(scrollHeight) self.context.GetViewTrait().ScrollDown(scrollHeight)
if self.context.RenderOnlyVisibleLines() { if self.context.RenderOnlyVisibleLines() {
return self.context.HandleRender() self.context.HandleRender()
} }
return nil return nil

View file

@ -17,7 +17,8 @@ func (self *ScreenModeActions) Next() error {
), ),
) )
return self.rerenderViewsWithScreenModeDependentContent() self.rerenderViewsWithScreenModeDependentContent()
return nil
} }
func (self *ScreenModeActions) Prev() error { func (self *ScreenModeActions) Prev() error {
@ -28,31 +29,28 @@ func (self *ScreenModeActions) Prev() error {
), ),
) )
return self.rerenderViewsWithScreenModeDependentContent() self.rerenderViewsWithScreenModeDependentContent()
return nil
} }
// these views need to be re-rendered when the screen mode changes. The commits view, // these views need to be re-rendered when the screen mode changes. The commits view,
// for example, will show authorship information in half and full screen mode. // for example, will show authorship information in half and full screen mode.
func (self *ScreenModeActions) rerenderViewsWithScreenModeDependentContent() error { func (self *ScreenModeActions) rerenderViewsWithScreenModeDependentContent() {
for _, context := range self.c.Context().AllList() { for _, context := range self.c.Context().AllList() {
if context.NeedsRerenderOnWidthChange() == types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_SCREEN_MODE_CHANGES { if context.NeedsRerenderOnWidthChange() == types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_SCREEN_MODE_CHANGES {
if err := self.rerenderView(context.GetView()); err != nil { self.rerenderView(context.GetView())
return err
} }
} }
}
return nil
} }
func (self *ScreenModeActions) rerenderView(view *gocui.View) error { func (self *ScreenModeActions) rerenderView(view *gocui.View) {
context, ok := self.c.Helpers().View.ContextForView(view.Name()) context, ok := self.c.Helpers().View.ContextForView(view.Name())
if !ok { if !ok {
self.c.Log.Errorf("no context found for view %s", view.Name()) self.c.Log.Errorf("no context found for view %s", view.Name())
return nil return
} }
return context.HandleRender() context.HandleRender()
} }
func nextIntInCycle(sl []types.WindowMaximisation, current types.WindowMaximisation) types.WindowMaximisation { func nextIntInCycle(sl []types.WindowMaximisation, current types.WindowMaximisation) types.WindowMaximisation {

View file

@ -223,7 +223,7 @@ func (self *TagsController) push(tag *models.Tag) error {
// Render again to remove the inline status: // Render again to remove the inline status:
self.c.OnUIThread(func() error { self.c.OnUIThread(func() error {
_ = self.c.Contexts().Tags.HandleRender() self.c.Contexts().Tags.HandleRender()
return nil return nil
}) })

View file

@ -177,9 +177,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
} }
for _, context := range contextsToRerender { for _, context := range contextsToRerender {
if err := context.HandleRender(); err != nil { context.HandleRender()
return err
}
} }
// here is a good place log some stuff // here is a good place log some stuff

View file

@ -105,7 +105,7 @@ type Context interface {
HandleFocus(opts OnFocusOpts) error HandleFocus(opts OnFocusOpts) error
HandleFocusLost(opts OnFocusLostOpts) error HandleFocusLost(opts OnFocusLostOpts) error
HandleRender() error HandleRender()
HandleRenderToMain() error HandleRenderToMain() error
} }

View file

@ -131,9 +131,7 @@ func (gui *Gui) postRefreshUpdate(c types.Context) error {
gui.Log.Infof("postRefreshUpdate for %s took %s", c.GetKey(), time.Since(t)) gui.Log.Infof("postRefreshUpdate for %s took %s", c.GetKey(), time.Since(t))
}() }()
if err := c.HandleRender(); err != nil { c.HandleRender()
return err
}
if gui.currentViewName() == c.GetViewName() { if gui.currentViewName() == c.GetViewName() {
if err := c.HandleFocus(types.OnFocusOpts{}); err != nil { if err := c.HandleFocus(types.OnFocusOpts{}); err != nil {