From 77623db1d0fc2d435b11098f2f50ad75b419c3ce Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Wed, 29 Aug 2018 11:56:28 +0200 Subject: [PATCH] apply fmt --- pkg/gui/files_panel.go | 2 +- pkg/gui/help_panel.go | 10 +++++----- pkg/gui/keybindings.go | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 6fa9e450b..90f2b7e84 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -185,7 +185,7 @@ func (gui *Gui) renderfilesOptions(g *gocui.Gui, file *commands.File) error { "e": gui.Tr.SLocalize("edit"), "a": gui.Tr.SLocalize("toggleStagedAll"), "PgUp/PgDn": gui.Tr.SLocalize("scroll"), - "?": gui.Tr.SLocalize("help"), + "?": gui.Tr.SLocalize("help"), } if gui.State.HasMergeConflicts { optionsMap["a"] = gui.Tr.SLocalize("abortMerge") diff --git a/pkg/gui/help_panel.go b/pkg/gui/help_panel.go index b9173fa88..7fb6a69b5 100644 --- a/pkg/gui/help_panel.go +++ b/pkg/gui/help_panel.go @@ -1,14 +1,14 @@ package gui import ( - "github.com/jesseduffield/gocui" "fmt" + "github.com/jesseduffield/gocui" "strings" ) func (gui *Gui) renderHelpOptions(g *gocui.Gui) error { optionsMap := map[string]string{ - "esc/q": gui.Tr.SLocalize("close"), + "esc/q": gui.Tr.SLocalize("close"), "PgUp/PgDn": gui.Tr.SLocalize("scroll"), } return gui.renderOptionsMap(g, optionsMap) @@ -47,9 +47,9 @@ func (gui *Gui) handleHelp(g *gocui.Gui, v *gocui.View) error { gui.renderHelpOptions(g) - for _, binding := range bindings{ + for _, binding := range bindings { if binding.Description != "" { - if curr != binding.ViewName { + if curr != binding.ViewName { curr = binding.ViewName content += fmt.Sprintf("\n%s:\n", strings.Title(curr)) } @@ -65,4 +65,4 @@ func (gui *Gui) handleHelp(g *gocui.Gui, v *gocui.View) error { return nil }) return nil -} \ No newline at end of file +} diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 9a21ec8b7..bdc5daf5d 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -6,10 +6,10 @@ import "github.com/jesseduffield/gocui" // is only handled if the given view has focus, or handled globally if the view // is "" type Binding struct { - ViewName string - Handler func(*gocui.Gui, *gocui.View) error - Key interface{} // FIXME: find out how to get `gocui.Key | rune` - Modifier gocui.Modifier + ViewName string + Handler func(*gocui.Gui, *gocui.View) error + Key interface{} // FIXME: find out how to get `gocui.Key | rune` + Modifier gocui.Modifier KeyReadable string Description string }