mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-24 10:13:41 -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.
79 lines
2.1 KiB
Go
79 lines
2.1 KiB
Go
package components
|
|
|
|
type CommitMessagePanelDriver struct {
|
|
t *TestDriver
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) getViewDriver() *ViewDriver {
|
|
return self.t.Views().CommitMessage()
|
|
}
|
|
|
|
// asserts on the text initially present in the prompt
|
|
func (self *CommitMessagePanelDriver) InitialText(expected *TextMatcher) *CommitMessagePanelDriver {
|
|
return self.Content(expected)
|
|
}
|
|
|
|
// asserts on the current context in the prompt
|
|
func (self *CommitMessagePanelDriver) Content(expected *TextMatcher) *CommitMessagePanelDriver {
|
|
self.getViewDriver().Content(expected)
|
|
|
|
return self
|
|
}
|
|
|
|
// asserts that the confirmation view has the expected title
|
|
func (self *CommitMessagePanelDriver) Title(expected *TextMatcher) *CommitMessagePanelDriver {
|
|
self.getViewDriver().Title(expected)
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) Type(value string) *CommitMessagePanelDriver {
|
|
self.t.typeContent(value)
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) SwitchToDescription() *CommitDescriptionPanelDriver {
|
|
self.getViewDriver().PressTab()
|
|
return &CommitDescriptionPanelDriver{t: self.t}
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) Clear() *CommitMessagePanelDriver {
|
|
self.getViewDriver().Clear()
|
|
return self
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) Confirm() {
|
|
self.getViewDriver().PressEnter()
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) Close() {
|
|
self.getViewDriver().PressEscape()
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) Cancel() {
|
|
self.getViewDriver().PressEscape()
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) SwitchToEditor() {
|
|
self.OpenCommitMenu()
|
|
self.t.ExpectPopup().Menu().Title(Equals("Commit Menu")).
|
|
Select(Contains("Open in editor")).
|
|
Confirm()
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) SelectPreviousMessage() *CommitMessagePanelDriver {
|
|
self.getViewDriver().SelectPreviousItem()
|
|
return self
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) SelectNextMessage() *CommitMessagePanelDriver {
|
|
self.getViewDriver().SelectNextItem()
|
|
return self
|
|
}
|
|
|
|
func (self *CommitMessagePanelDriver) OpenCommitMenu() *CommitMessagePanelDriver {
|
|
self.t.press(self.t.keys.CommitMessage.CommitMenu[0])
|
|
return self
|
|
}
|