mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-14 01:26:24 -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.
68 lines
2.1 KiB
Go
68 lines
2.1 KiB
Go
package custom_commands
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var SelectedCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Use the {{ .SelectedCommit }} template variable in different contexts",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateNCommits(3)
|
|
},
|
|
SetupConfig: func(cfg *config.AppConfig) {
|
|
cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
|
|
{
|
|
Key: "X",
|
|
Context: "global",
|
|
Command: "printf '%s' '{{ .SelectedCommit.Name }}' > file.txt",
|
|
},
|
|
}
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
// Select different commits in each of the commit views
|
|
t.Views().Commits().Focus().
|
|
NavigateToLine(Contains("commit 01"))
|
|
t.Views().ReflogCommits().Focus().
|
|
NavigateToLine(Contains("commit 02"))
|
|
t.Views().Branches().Focus().
|
|
Lines(Contains("master").IsSelected()).
|
|
PressEnter()
|
|
t.Views().SubCommits().IsFocused().
|
|
NavigateToLine(Contains("commit 03"))
|
|
|
|
// SubCommits
|
|
t.GlobalPress(config.Keybinding{"X"})
|
|
t.FileSystem().FileContent("file.txt", Equals("commit 03"))
|
|
|
|
t.Views().SubCommits().PressEnter()
|
|
t.GlobalPress(config.Keybinding{"X"})
|
|
t.FileSystem().FileContent("file.txt", Equals("commit 03"))
|
|
|
|
// ReflogCommits
|
|
t.Views().ReflogCommits().Focus()
|
|
t.GlobalPress(config.Keybinding{"X"})
|
|
t.FileSystem().FileContent("file.txt", Equals("commit: commit 02"))
|
|
|
|
t.Views().ReflogCommits().PressEnter()
|
|
t.GlobalPress(config.Keybinding{"X"})
|
|
t.FileSystem().FileContent("file.txt", Equals("commit: commit 02"))
|
|
|
|
// LocalCommits
|
|
t.Views().Commits().Focus()
|
|
t.GlobalPress(config.Keybinding{"X"})
|
|
t.FileSystem().FileContent("file.txt", Equals("commit 01"))
|
|
|
|
t.Views().Commits().PressEnter()
|
|
t.GlobalPress(config.Keybinding{"X"})
|
|
t.FileSystem().FileContent("file.txt", Equals("commit 01"))
|
|
|
|
// None of these
|
|
t.Views().Files().Focus()
|
|
t.GlobalPress(config.Keybinding{"X"})
|
|
t.FileSystem().FileContent("file.txt", Equals("commit 01"))
|
|
},
|
|
})
|