From 37b118f4fbb4f82c072a00b6f7e66d73f03e0d55 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 1 Jun 2025 18:12:12 +0200 Subject: [PATCH] Cleanup: restructure code for clarity There was no reason to declare a variable for disabledReason, assign it inside the "if binding.GetDisabledReason != nil" statement, and then check its value again after that if statement. Move all that code inside the first if statement to make the control flow easier to understand. --- pkg/gui/keybindings.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index e52f9a815..fe3b88ef3 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -523,19 +523,18 @@ func (gui *Gui) SetMouseKeybinding(binding *gocui.ViewMouseBinding) error { } func (gui *Gui) callKeybindingHandler(binding *types.Binding) error { - var disabledReason *types.DisabledReason if binding.GetDisabledReason != nil { - disabledReason = binding.GetDisabledReason() - } - if disabledReason != nil { - if disabledReason.ShowErrorInPanel { - return errors.New(disabledReason.Text) - } + if disabledReason := binding.GetDisabledReason(); disabledReason != nil { + if disabledReason.ShowErrorInPanel { + return errors.New(disabledReason.Text) + } - if len(disabledReason.Text) > 0 { - gui.c.ErrorToast(gui.Tr.DisabledMenuItemPrefix + disabledReason.Text) + if len(disabledReason.Text) > 0 { + gui.c.ErrorToast(gui.Tr.DisabledMenuItemPrefix + disabledReason.Text) + } + return nil } - return nil } + return binding.Handler() }