From f6e316dfe5a35696e091f760e533a7a62f946f99 Mon Sep 17 00:00:00 2001 From: Sam Burville Date: Sun, 17 Oct 2021 18:22:59 +0100 Subject: Improve JumpToBlock keybinding functionality Improve experience when yaml file has != 5 keybindings and change view helper to use the length of the array instead of hardcoded value. --- pkg/gui/keybindings.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'pkg/gui/keybindings.go') diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 1678ee03c..76a33a33a 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -1818,12 +1818,16 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { } // Appends keybindings to jump to a particular sideView using numbers - for i, window := range []string{"status", "files", "branches", "commits", "stash"} { - bindings = append(bindings, &Binding{ - ViewName: "", - Key: gui.getKey(config.Universal.JumpToBlock[i]), - Modifier: gocui.ModNone, - Handler: gui.goToSideWindow(window)}) + if len(config.Universal.JumpToBlock) != 5 { + log.Fatal("Jump to block keybindings cannot be set. Exactly 5 keybindings must be supplied.") + } else { + for i, window := range []string{"status", "files", "branches", "commits", "stash"} { + bindings = append(bindings, &Binding{ + ViewName: "", + Key: gui.getKey(config.Universal.JumpToBlock[i]), + Modifier: gocui.ModNone, + Handler: gui.goToSideWindow(window)}) + } } for viewName := range gui.State.Contexts.initialViewTabContextMap() { -- cgit v1.2.3