sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

refactor

Browse Source
This commit is contained in:
Jesse Duffield
2021-04-02 00:48:13 +11:00
parent cc9293b386
commit eeeef9ca86
3 changed files with 227 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/gui/keybindings.go
View File

@ -1410,42 +1410,42 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.Select),
Handler: gui.handlePickHunk,
Handler: gui.wrappedHandler(gui.handlePickHunk),
Description: gui.Tr.PickHunk,
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Main.PickBothHunks),
Handler: gui.handlePickBothHunks,
Handler: gui.wrappedHandler(gui.handlePickBothHunks),
Description: gui.Tr.PickBothHunks,
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.PrevBlock),
Handler: gui.handleSelectPrevConflict,
Handler: gui.wrappedHandler(gui.handleSelectPrevConflict),
Description: gui.Tr.PrevConflict,
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.NextBlock),
Handler: gui.handleSelectNextConflict,
Handler: gui.wrappedHandler(gui.handleSelectNextConflict),
Description: gui.Tr.NextConflict,
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.PrevItem),
Handler: gui.handleSelectTop,
Handler: gui.wrappedHandler(gui.handleSelectTop),
Description: gui.Tr.SelectTop,
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.NextItem),
Handler: gui.handleSelectBottom,
Handler: gui.wrappedHandler(gui.handleSelectBottom),
Description: gui.Tr.SelectBottom,
},
{
@ -1453,48 +1453,48 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gocui.MouseWheelUp,
Modifier: gocui.ModNone,
Handler: gui.handleSelectTop,
Handler: gui.wrappedHandler(gui.handleSelectTop),
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gocui.MouseWheelDown,
Modifier: gocui.ModNone,
Handler: gui.handleSelectBottom,
Handler: gui.wrappedHandler(gui.handleSelectBottom),
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.PrevBlockAlt),
Modifier: gocui.ModNone,
Handler: gui.handleSelectPrevConflict,
Handler: gui.wrappedHandler(gui.handleSelectPrevConflict),
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.NextBlockAlt),
Modifier: gocui.ModNone,
Handler: gui.handleSelectNextConflict,
Handler: gui.wrappedHandler(gui.handleSelectNextConflict),
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.PrevItemAlt),
Modifier: gocui.ModNone,
Handler: gui.handleSelectTop,
Handler: gui.wrappedHandler(gui.handleSelectTop),
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.NextItemAlt),
Modifier: gocui.ModNone,
Handler: gui.handleSelectBottom,
Handler: gui.wrappedHandler(gui.handleSelectBottom),
},
{
ViewName: "main",
Contexts: []string{MAIN_MERGING_CONTEXT_KEY},
Key: gui.getKey(config.Universal.Undo),
Handler: gui.handlePopFileSnapshot,
Handler: gui.wrappedHandler(gui.handlePopFileSnapshot),
Description: gui.Tr.LcUndo,
},
{