mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-11 08:06:25 -04:00
fbcf562e29
CustomCommand.Key and CustomCommandMenuOption.Key are user-configured keybindings just like the built-in ones. Converting them to the Keybinding type lets a user assign multiple keys to the same custom command, e.g. `key: [a, b]`, the same way they would for any other keybinding. The validator iterates over the elements rather than checking a single string, the binding registration goes through GetValidatedKeyBindingKeys to register every alternate, and the existing error messages use .String() so a multi-key binding renders sensibly. CustomCommandPrompt.Key (a form field name, not a keybinding) stays a plain string.
43 lines
1.2 KiB
Go
43 lines
1.2 KiB
Go
package custom_commands
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
|
|
)
|
|
|
|
var CheckForConflicts = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Run a command and check for conflicts after",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupRepo: func(shell *Shell) {
|
|
shared.MergeConflictsSetup(shell)
|
|
},
|
|
SetupConfig: func(cfg *config.AppConfig) {
|
|
cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
|
|
{
|
|
Key: config.Keybinding{"m"},
|
|
Context: "localBranches",
|
|
Command: "git merge {{ .SelectedLocalBranch.Name | quote }}",
|
|
After: &config.CustomCommandAfterHook{
|
|
CheckForConflicts: true,
|
|
},
|
|
},
|
|
}
|
|
|
|
cfg.GetUserConfig().Git.LocalBranchSortOrder = "recency"
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Branches().
|
|
Focus().
|
|
TopLines(
|
|
Contains("first-change-branch"),
|
|
Contains("second-change-branch"),
|
|
).
|
|
NavigateToLine(Contains("second-change-branch")).
|
|
Press(config.Keybinding{"m"})
|
|
|
|
t.Common().AcknowledgeConflicts()
|
|
},
|
|
})
|