mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 02:24:49 -05:00
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.
161 lines
3.9 KiB
Go
161 lines
3.9 KiB
Go
package commit
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var Search = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Search for a commit",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
// Creating a branch avoids that searching for 't' will unexpectedly match the first commit
|
|
// (since it finds it in the extra info line, which is "HEAD -> master")
|
|
shell.NewBranch("branch")
|
|
|
|
shell.EmptyCommit("one")
|
|
shell.EmptyCommit("two")
|
|
shell.EmptyCommit("three")
|
|
shell.EmptyCommit("four")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.StartSearch).
|
|
Tap(func() {
|
|
t.ExpectSearch().
|
|
Type("two").
|
|
Confirm()
|
|
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 'two' (1 of 1)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.StartSearch).
|
|
Tap(func() {
|
|
t.ExpectSearch().
|
|
Clear().
|
|
Type("o").
|
|
Confirm()
|
|
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 'o' (2 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
).
|
|
Press(config.Keybinding{"n"}).
|
|
Tap(func() {
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 'o' (3 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one").IsSelected(),
|
|
).
|
|
Press(config.Keybinding{"n"}).
|
|
Tap(func() {
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(config.Keybinding{"n"}).
|
|
Tap(func() {
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 'o' (2 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
).
|
|
Press(config.Keybinding{"N"}).
|
|
Tap(func() {
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(config.Keybinding{"N"}).
|
|
Tap(func() {
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 'o' (3 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one").IsSelected(),
|
|
).
|
|
NavigateToLine(Contains("three")).
|
|
Tap(func() {
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)"))
|
|
}).
|
|
Press(config.Keybinding{"N"}).
|
|
Tap(func() {
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)"))
|
|
}).
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.StartSearch).
|
|
Tap(func() {
|
|
t.ExpectSearch().
|
|
Type("t").
|
|
Confirm()
|
|
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 't' (1 of 2)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three").IsSelected(),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
SelectPreviousItem().
|
|
Tap(func() {
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 't' (1 of 2)"))
|
|
}).
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(config.Keybinding{"n"}).
|
|
Tap(func() {
|
|
t.Views().Search().IsVisible().Content(Contains("matches for 't' (1 of 2)"))
|
|
}).
|
|
Lines(
|
|
Contains("four"),
|
|
Contains("three").IsSelected(),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
)
|
|
},
|
|
})
|