From 79848087bccd5c87af1dbb44a39753aad1346f8b Mon Sep 17 00:00:00 2001 From: mjarkk Date: Tue, 27 Jul 2021 15:00:37 +0200 Subject: Switch to github.com/gookit/color for terminal colors --- pkg/gui/searching.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'pkg/gui/searching.go') diff --git a/pkg/gui/searching.go b/pkg/gui/searching.go index 3c6f1b154..6832aab71 100644 --- a/pkg/gui/searching.go +++ b/pkg/gui/searching.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/jesseduffield/lazygit/pkg/theme" - "github.com/jesseduffield/lazygit/pkg/utils" ) func (gui *Gui) handleOpenSearch(viewName string) error { @@ -53,10 +52,7 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in fmt.Sprintf( "no matches for '%s' %s", gui.State.Searching.searchString, - utils.ColoredString( - fmt.Sprintf("%s: exit search mode", gui.getKeyDisplay(keybindingConfig.Universal.Return)), - theme.OptionsFgColor, - ), + theme.OptionsFgColor.Sprintf("%s: exit search mode", gui.getKeyDisplay(keybindingConfig.Universal.Return)), ), ) return nil @@ -68,14 +64,11 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in gui.State.Searching.searchString, index+1, total, - utils.ColoredString( - fmt.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), - ), - theme.OptionsFgColor, + 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), ), ), ) -- cgit v1.2.3