mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 02:24:49 -05:00
Stefan Haller
5748d82073
Until now every keybinding config field was a plain string. That meant a user
couldn't ask for two keys to invoke a command — the config silently accepted
only one form.
Convert every string-typed field across all 13 KeybindingXxxConfig structs to
Keybinding so the union type extends to every command. Defaults wrap their
single-key value in Keybinding{...} so the generated Config.md still renders one
scalar key per binding.
The alt fields keep their separate Binding registrations for now: this commit
does not yet introduce the merge mechanism that folds them into the main field —
that comes in a follow-up. Consumers previously calling opts.GetKeys on a string
field now call opts.GetKeys on the Keybinding, or take .String() / Keys[0] where
a single value is needed.
Adds a Keybinding.String helper for rendering, schema-generator work that
inlines the Keybinding union into each consuming property, and a unit test
covering the user-facing scalar/sequence YAML forms for quit.
103 lines
2.5 KiB
Go
103 lines
2.5 KiB
Go
package components
|
|
|
|
type PromptDriver struct {
|
|
t *TestDriver
|
|
hasCheckedTitle bool
|
|
}
|
|
|
|
func (self *PromptDriver) getViewDriver() *ViewDriver {
|
|
return self.t.Views().Prompt()
|
|
}
|
|
|
|
// asserts that the popup has the expected title
|
|
func (self *PromptDriver) Title(expected *TextMatcher) *PromptDriver {
|
|
self.getViewDriver().Title(expected)
|
|
|
|
self.hasCheckedTitle = true
|
|
|
|
return self
|
|
}
|
|
|
|
// asserts on the text initially present in the prompt
|
|
func (self *PromptDriver) InitialText(expected *TextMatcher) *PromptDriver {
|
|
self.getViewDriver().Content(expected)
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *PromptDriver) Type(value string) *PromptDriver {
|
|
self.t.typeContent(value)
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *PromptDriver) Clear() *PromptDriver {
|
|
self.t.press(ClearKey)
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *PromptDriver) Confirm() {
|
|
self.checkNecessaryChecksCompleted()
|
|
|
|
self.getViewDriver().PressEnter()
|
|
}
|
|
|
|
func (self *PromptDriver) Cancel() {
|
|
self.checkNecessaryChecksCompleted()
|
|
|
|
self.getViewDriver().PressEscape()
|
|
}
|
|
|
|
func (self *PromptDriver) checkNecessaryChecksCompleted() {
|
|
if !self.hasCheckedTitle {
|
|
self.t.Fail("You must check the title of a prompt popup by calling Title() before calling Confirm()/Cancel().")
|
|
}
|
|
}
|
|
|
|
func (self *PromptDriver) SuggestionLines(matchers ...*TextMatcher) *PromptDriver {
|
|
self.t.Views().Suggestions().Lines(matchers...)
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *PromptDriver) SuggestionTopLines(matchers ...*TextMatcher) *PromptDriver {
|
|
self.t.Views().Suggestions().TopLines(matchers...)
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *PromptDriver) ConfirmFirstSuggestion() {
|
|
self.t.press(self.t.keys.Universal.TogglePanel[0])
|
|
self.t.Views().Suggestions().
|
|
IsFocused().
|
|
SelectedLineIdx(0).
|
|
Press(self.t.keys.Universal.ConfirmSuggestion)
|
|
}
|
|
|
|
func (self *PromptDriver) ConfirmSuggestion(matcher *TextMatcher) {
|
|
self.t.press(self.t.keys.Universal.TogglePanel[0])
|
|
self.t.Views().Suggestions().
|
|
IsFocused().
|
|
NavigateToLine(matcher).
|
|
Press(self.t.keys.Universal.ConfirmSuggestion)
|
|
}
|
|
|
|
func (self *PromptDriver) DeleteSuggestion(matcher *TextMatcher) *PromptDriver {
|
|
self.t.press(self.t.keys.Universal.TogglePanel[0])
|
|
self.t.Views().Suggestions().
|
|
IsFocused().
|
|
NavigateToLine(matcher)
|
|
self.t.press(self.t.keys.Universal.Remove[0])
|
|
return self
|
|
}
|
|
|
|
func (self *PromptDriver) EditSuggestion(matcher *TextMatcher) *PromptDriver {
|
|
self.t.press(self.t.keys.Universal.TogglePanel[0])
|
|
self.t.Views().Suggestions().
|
|
IsFocused().
|
|
NavigateToLine(matcher)
|
|
self.t.press(self.t.keys.Universal.Edit[0])
|
|
return self
|
|
}
|