From d0805616e410bdf37f42737782cdc309ef1dd17a Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 23 Feb 2022 18:48:50 +1100 Subject: [PATCH] move function --- pkg/gui/confirmation_panel.go | 14 ++++++++++++++ pkg/gui/credentials_panel.go | 15 --------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go index 15e5a8f45..f1eff4849 100644 --- a/pkg/gui/confirmation_panel.go +++ b/pkg/gui/confirmation_panel.go @@ -295,3 +295,17 @@ func (gui *Gui) refreshSuggestions() { return func() { gui.setSuggestions(suggestions) } }) } + +func (gui *Gui) handleAskFocused() error { + keybindingConfig := gui.c.UserConfig.Keybinding + + message := utils.ResolvePlaceholderString( + gui.c.Tr.CloseConfirm, + map[string]string{ + "keyBindClose": gui.getKeyDisplay(keybindingConfig.Universal.Return), + "keyBindConfirm": gui.getKeyDisplay(keybindingConfig.Universal.Confirm), + }, + ) + + return gui.renderString(gui.Views.Options, message) +} diff --git a/pkg/gui/credentials_panel.go b/pkg/gui/credentials_panel.go index 1277ac8ef..ba654e0eb 100644 --- a/pkg/gui/credentials_panel.go +++ b/pkg/gui/credentials_panel.go @@ -5,7 +5,6 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/gui/types" - "github.com/jesseduffield/lazygit/pkg/utils" ) type credentials chan string @@ -56,17 +55,3 @@ func (gui *Gui) handleCloseCredentialsView() error { gui.credentials <- "" return gui.c.PopContext() } - -func (gui *Gui) handleAskFocused() error { - keybindingConfig := gui.c.UserConfig.Keybinding - - message := utils.ResolvePlaceholderString( - gui.c.Tr.CloseConfirm, - map[string]string{ - "keyBindClose": gui.getKeyDisplay(keybindingConfig.Universal.Return), - "keyBindConfirm": gui.getKeyDisplay(keybindingConfig.Universal.Confirm), - }, - ) - - return gui.renderString(gui.Views.Options, message) -}