From da3e00823f733743c2bd8076d13955dbed9fcbae Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Thu, 1 Oct 2020 08:18:16 +1000
Subject: allow submodule init and show submodule diff with a prefix

---
 pkg/gui/keybindings.go | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'pkg/gui/keybindings.go')

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 1c1fa6c9a..992f32313 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -1560,13 +1560,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Modifier: gocui.ModNone,
 			Handler:  gui.wrappedHandler(gui.onMenuPress),
 		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{SUBMODULES_CONTEXT_KEY},
-			Key:         gui.getKey("universal.goInto"),
-			Handler:     gui.wrappedHandler(gui.handleSubmoduleEnter),
-			Description: gui.Tr.SLocalize("enterSubmodule"),
-		},
 		{
 			ViewName:    "files",
 			Key:         gui.getKey("universal.nextTab"),
@@ -1586,19 +1579,26 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.wrappedHandler(gui.handleCopySelectedSideContextItemToClipboard),
 			Description: gui.Tr.SLocalize("copySubmoduleNameToClipboard"),
 		},
+		{
+			ViewName:    "files",
+			Contexts:    []string{SUBMODULES_CONTEXT_KEY},
+			Key:         gui.getKey("universal.goInto"),
+			Handler:     gui.forSubmodule(gui.handleSubmoduleEnter),
+			Description: gui.Tr.SLocalize("enterSubmodule"),
+		},
 		{
 			ViewName: "files",
 			Contexts: []string{SUBMODULES_CONTEXT_KEY},
 			Key:      gui.getKey("universal.remove"),
 
-			Handler:     gui.wrappedHandler(gui.handleRemoveSubmodule),
+			Handler:     gui.forSubmodule(gui.handleRemoveSubmodule),
 			Description: gui.Tr.SLocalize("removeSubmodule"),
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{SUBMODULES_CONTEXT_KEY},
 			Key:         gui.getKey("u"),
-			Handler:     gui.wrappedHandler(gui.handleResetSubmodule),
+			Handler:     gui.forSubmodule(gui.handleResetSubmodule),
 			Description: gui.Tr.SLocalize("submoduleStashAndReset"),
 		},
 		{
@@ -1612,9 +1612,16 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			ViewName:    "files",
 			Contexts:    []string{SUBMODULES_CONTEXT_KEY},
 			Key:         gui.getKey("universal.edit"),
-			Handler:     gui.wrappedHandler(gui.handleEditSubmoduleUrl),
+			Handler:     gui.forSubmodule(gui.handleEditSubmoduleUrl),
 			Description: gui.Tr.SLocalize("editSubmoduleUrl"),
 		},
+		{
+			ViewName:    "files",
+			Contexts:    []string{SUBMODULES_CONTEXT_KEY},
+			Key:         gui.getKey("submodules.init"),
+			Handler:     gui.forSubmodule(gui.handleSubmoduleInit),
+			Description: gui.Tr.SLocalize("initSubmodule"),
+		},
 	}
 
 	for _, viewName := range []string{"status", "branches", "files", "commits", "commitFiles", "stash", "menu"} {
-- 
cgit v1.2.3