480 - remove duplication by using a decorator

Also use a for loop to append the new keybindings

1 files changed, 8 insertions, 37 deletions

diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index ca3ababd1..7426ce18f 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -139,44 +139,15 @@ func (gui *Gui) returnFocus(g *gocui.Gui, v *gocui.View) error {
 	return gui.switchFocus(g, v, previousView)
 }
 
-func (gui *Gui) goToStatus(g *gocui.Gui, v *gocui.View) error {
-	view, err := g.View("status")
-	if err != nil {
-		gui.Log.Error(err)
-	}
-	return gui.switchFocus(g, nil, view)
-}
-
-func (gui *Gui) goToFiles(g *gocui.Gui, v *gocui.View) error {
-	view, err := g.View("files")
-	if err != nil {
-		gui.Log.Error(err)
-	}
-	return gui.switchFocus(g, nil, view)
-}
-
-func (gui *Gui) goToBranches(g *gocui.Gui, v *gocui.View) error {
-	view, err := g.View("branches")
-	if err != nil {
-		gui.Log.Error(err)
-	}
-	return gui.switchFocus(g, nil, view)
-}
-
-func (gui *Gui) goToCommits(g *gocui.Gui, v *gocui.View) error {
-	view, err := g.View("commits")
-	if err != nil {
-		gui.Log.Error(err)
-	}
-	return gui.switchFocus(g, nil, view)
-}
-
-func (gui *Gui) goToStash(g *gocui.Gui, v *gocui.View) error {
-	view, err := g.View("stash")
-	if err != nil {
-		gui.Log.Error(err)
+func (gui *Gui) goToSideView(sideViewName string) func(g *gocui.Gui, v *gocui.View) error {
+	return func(g *gocui.Gui, v *gocui.View) error {
+		view, err := g.View(sideViewName)
+		if err != nil {
+			gui.Log.Error(err)
+			return nil
+		}
+		return gui.switchFocus(g, nil, view)
 	}
-	return gui.switchFocus(g, nil, view)
 }
 
 // pass in oldView = nil if you don't want to be able to return to your old view