mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-14 17:46:26 -04:00
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.
66 lines
1.9 KiB
Go
66 lines
1.9 KiB
Go
package custom_commands
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
// NOTE: we're getting a weird offset in the popup prompt for some reason. Not sure what's behind that.
|
|
|
|
var MenuFromCommand = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Using menuFromCommand prompt type",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
EmptyCommit("foo").
|
|
EmptyCommit("bar").
|
|
EmptyCommit("baz").
|
|
NewBranch("feature/foo")
|
|
},
|
|
SetupConfig: func(cfg *config.AppConfig) {
|
|
cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
|
|
{
|
|
Key: "a",
|
|
Context: "localBranches",
|
|
Command: `echo "{{index .PromptResponses 0}} {{index .PromptResponses 1}} {{ .SelectedLocalBranch.Name }}" > output.txt`,
|
|
Prompts: []config.CustomCommandPrompt{
|
|
{
|
|
Type: "menuFromCommand",
|
|
Title: "Choose commit message",
|
|
Command: `git log --oneline --pretty=%B`,
|
|
Filter: `(?P<commit_message>.*)`,
|
|
ValueFormat: `{{ .commit_message }}`,
|
|
LabelFormat: `{{ .commit_message | yellow }}`,
|
|
},
|
|
{
|
|
Type: "input",
|
|
Title: "Description",
|
|
InitialValue: `{{ if .SelectedLocalBranch.Name }}Branch: #{{ .SelectedLocalBranch.Name }}{{end}}`,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Files().
|
|
IsEmpty()
|
|
|
|
t.Views().Branches().
|
|
Focus().
|
|
Press(config.Keybinding{"a"})
|
|
|
|
t.ExpectPopup().Menu().Title(Equals("Choose commit message")).Select(Contains("bar")).Confirm()
|
|
|
|
t.ExpectPopup().Prompt().Title(Equals("Description")).Type(" my branch").Confirm()
|
|
|
|
t.Views().Files().
|
|
Focus().
|
|
Lines(
|
|
Contains("output.txt").IsSelected(),
|
|
)
|
|
|
|
t.Views().Main().Content(Contains("bar Branch: #feature/foo my branch feature/foo"))
|
|
},
|
|
})
|