mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 04:15:48 +02:00
9812d2fca4
This partially adds the feature back that was removed in #2495. This allows specifing a secondary Return keybinding. In my personal setup I use the `q` for this (and remove it as the default for Quit). Returning is a very common operation in lazygit, and having to reach for the Escape key all the time is annoying. There are cases where it's not possible to use a regular letter as the Return keybinding, such as the commit prompt.
91 lines
2.6 KiB
Go
91 lines
2.6 KiB
Go
package controllers
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/gui/context"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
type SuggestionsController struct {
|
|
baseController
|
|
*ListControllerTrait[*types.Suggestion]
|
|
c *ControllerCommon
|
|
}
|
|
|
|
var _ types.IController = &SuggestionsController{}
|
|
|
|
func NewSuggestionsController(
|
|
c *ControllerCommon,
|
|
) *SuggestionsController {
|
|
return &SuggestionsController{
|
|
baseController: baseController{},
|
|
ListControllerTrait: NewListControllerTrait[*types.Suggestion](
|
|
c,
|
|
c.Contexts().Suggestions,
|
|
c.Contexts().Suggestions.GetSelected,
|
|
c.Contexts().Suggestions.GetSelectedItems,
|
|
),
|
|
c: c,
|
|
}
|
|
}
|
|
|
|
func (self *SuggestionsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
|
|
bindings := []*types.Binding{
|
|
{
|
|
Key: opts.GetKey(opts.Config.Universal.Confirm),
|
|
Handler: func() error { return self.context().State.OnConfirm() },
|
|
GetDisabledReason: self.require(self.singleItemSelected()),
|
|
},
|
|
{
|
|
Key: opts.GetKey(opts.Config.Universal.Return),
|
|
Handler: func() error { return self.context().State.OnClose() },
|
|
},
|
|
{
|
|
Key: opts.GetKey(opts.Config.Universal.ReturnAlt1),
|
|
Handler: func() error { return self.context().State.OnClose() },
|
|
},
|
|
{
|
|
Key: opts.GetKey(opts.Config.Universal.TogglePanel),
|
|
Handler: self.switchToConfirmation,
|
|
},
|
|
{
|
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
|
Handler: func() error {
|
|
return self.context().State.OnDeleteSuggestion()
|
|
},
|
|
},
|
|
{
|
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
|
Handler: func() error {
|
|
if self.context().State.AllowEditSuggestion {
|
|
if selectedItem := self.c.Contexts().Suggestions.GetSelected(); selectedItem != nil {
|
|
self.c.Contexts().Confirmation.GetView().TextArea.Clear()
|
|
self.c.Contexts().Confirmation.GetView().TextArea.TypeString(selectedItem.Value)
|
|
self.c.Contexts().Confirmation.GetView().RenderTextArea()
|
|
self.c.Contexts().Suggestions.RefreshSuggestions()
|
|
return self.switchToConfirmation()
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
},
|
|
}
|
|
|
|
return bindings
|
|
}
|
|
|
|
func (self *SuggestionsController) switchToConfirmation() error {
|
|
self.c.Views().Suggestions.Subtitle = ""
|
|
self.c.Views().Suggestions.Highlight = false
|
|
return self.c.ReplaceContext(self.c.Contexts().Confirmation)
|
|
}
|
|
|
|
func (self *SuggestionsController) GetOnFocusLost() func(types.OnFocusLostOpts) error {
|
|
return func(types.OnFocusLostOpts) error {
|
|
self.c.Helpers().Confirmation.DeactivateConfirmationPrompt()
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func (self *SuggestionsController) context() *context.SuggestionsContext {
|
|
return self.c.Contexts().Suggestions
|
|
}
|