From 7410acd1aaa97f678295a328264360802346b33a Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 6 Aug 2022 18:50:52 +1000 Subject: move merge conflicts code into controller --- pkg/gui/searching.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkg/gui/searching.go') diff --git a/pkg/gui/searching.go b/pkg/gui/searching.go index c38c77e0a..a8580655c 100644 --- a/pkg/gui/searching.go +++ b/pkg/gui/searching.go @@ -3,6 +3,7 @@ package gui import ( "fmt" + "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/theme" ) @@ -52,7 +53,7 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in fmt.Sprintf( "no matches for '%s' %s", gui.State.Searching.searchString, - theme.OptionsFgColor.Sprintf("%s: exit search mode", gui.getKeyDisplay(keybindingConfig.Universal.Return)), + theme.OptionsFgColor.Sprintf("%s: exit search mode", keybindings.Label(keybindingConfig.Universal.Return)), ), ) } @@ -65,9 +66,9 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in total, theme.OptionsFgColor.Sprintf( "%s: next match, %s: previous match, %s: exit search mode", - gui.getKeyDisplay(keybindingConfig.Universal.NextMatch), - gui.getKeyDisplay(keybindingConfig.Universal.PrevMatch), - gui.getKeyDisplay(keybindingConfig.Universal.Return), + keybindings.Label(keybindingConfig.Universal.NextMatch), + keybindings.Label(keybindingConfig.Universal.PrevMatch), + keybindings.Label(keybindingConfig.Universal.Return), ), ), ) -- cgit v1.2.3