feat: move switch to editor to commit menu

Author: 2KAbhishek

docs/Config.md

@@ -271,8 +271,7 @@ keybinding:
     update: 'u'
     bulkMenu: 'b'
   commitMessage:
-    switchToEditor: '<c-o>'
-    commitMenu: '<c-e>'
+    commitMenu: '<c-o>'
   amendAttribute:
     addCoAuthor: 'c'
     resetAuthor: 'a'

pkg/config/user_config.go

@@ -440,8 +440,7 @@ type KeybindingSubmodulesConfig struct {
 }
 
 type KeybindingCommitMessageConfig struct {
-	SwitchToEditor string `yaml:"switchToEditor"`
-	CommitMenu     string `yaml:"commitMenu"`
+	CommitMenu string `yaml:"commitMenu"`
 }
 
 // OSConfig contains config on the level of the os
@@ -830,8 +829,7 @@ func GetDefaultConfig() *UserConfig {
 				BulkMenu: "b",
 			},
 			CommitMessage: KeybindingCommitMessageConfig{
-				SwitchToEditor: "<c-o>",
-				CommitMenu:     "<c-e>",
+				CommitMenu: "<c-o>",
 			},
 		},
 		OS:                           OSConfig{},

pkg/gui/context/commit_message_context.go

@@ -115,9 +115,8 @@ func (self *CommitMessageContext) SetPanelState(
 	subtitleTemplate := lo.Ternary(onSwitchToEditor != nil, self.c.Tr.CommitDescriptionSubTitle, self.c.Tr.CommitDescriptionSubTitleNoSwitch)
 	self.c.Views().CommitDescription.Subtitle = utils.ResolvePlaceholderString(subtitleTemplate,
 		map[string]string{
-			"togglePanelKeyBinding":    keybindings.Label(self.c.UserConfig.Keybinding.Universal.TogglePanel),
-			"switchToEditorKeyBinding": keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.SwitchToEditor),
-			"commitMenuKeybinding":     keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.CommitMenu),
+			"togglePanelKeyBinding": keybindings.Label(self.c.UserConfig.Keybinding.Universal.TogglePanel),
+			"commitMenuKeybinding":  keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.CommitMenu),
 		})
 }
 

pkg/gui/controllers/commit_description_controller.go

@@ -35,10 +35,6 @@ func (self *CommitDescriptionController) GetKeybindings(opts types.KeybindingsOp
 			Key:     opts.GetKey(opts.Config.Universal.ConfirmInEditor),
 			Handler: self.confirm,
 		},
-		{
-			Key:     opts.GetKey(opts.Config.CommitMessage.SwitchToEditor),
-			Handler: self.switchToEditor,
-		},
 		{
 			Key:     opts.GetKey(opts.Config.CommitMessage.CommitMenu),
 			Handler: self.openCommitMenu,
@@ -68,10 +64,6 @@ func (self *CommitDescriptionController) confirm() error {
 	return self.c.Helpers().Commits.HandleCommitConfirm()
 }
 
-func (self *CommitDescriptionController) switchToEditor() error {
-	return self.c.Helpers().Commits.SwitchToEditor()
-}
-
 func (self *CommitDescriptionController) openCommitMenu() error {
 	return self.c.Helpers().Commits.OpenCommitMenu()
 }

pkg/gui/controllers/commit_message_controller.go

@@ -46,10 +46,6 @@ func (self *CommitMessageController) GetKeybindings(opts types.KeybindingsOpts)
 			Key:     opts.GetKey(opts.Config.Universal.TogglePanel),
 			Handler: self.switchToCommitDescription,
 		},
-		{
-			Key:     opts.GetKey(opts.Config.CommitMessage.SwitchToEditor),
-			Handler: self.switchToEditor,
-		},
 		{
 			Key:     opts.GetKey(opts.Config.CommitMessage.CommitMenu),
 			Handler: self.openCommitMenu,
@@ -92,10 +88,6 @@ func (self *CommitMessageController) switchToCommitDescription() error {
 	return nil
 }
 
-func (self *CommitMessageController) switchToEditor() error {
-	return self.c.Helpers().Commits.SwitchToEditor()
-}
-
 func (self *CommitMessageController) handleCommitIndexChange(value int) error {
 	currentIndex := self.context().GetSelectedIndex()
 	newIndex := currentIndex + value

pkg/gui/controllers/helpers/commits_helper.go

@@ -201,6 +201,13 @@ func (self *CommitsHelper) OpenCommitMenu() error {
 			},
 			Key: 'c',
 		},
+		{
+			Label: self.c.Tr.OpenInEditor,
+			OnPress: func() error {
+				return self.SwitchToEditor()
+			},
+			Key: 'e',
+		},
 	}
 	return self.c.Menu(types.CreateMenuOptions{
 		Title: self.c.Tr.CommitMenuTitle,

pkg/i18n/english.go

@@ -1001,7 +1001,7 @@ func EnglishTranslationSet() TranslationSet {
 		RebaseOptionsTitle:                  "Rebase options",
 		CommitSummaryTitle:                  "Commit summary",
 		CommitDescriptionTitle:              "Commit description",
-		CommitDescriptionSubTitle:           "{{.togglePanelKeyBinding}} Toggle focus, {{.switchToEditorKeyBinding}} Open editor, {{.commitMenuKeybinding}} Menu",
+		CommitDescriptionSubTitle:           "Toggle focus {{.togglePanelKeyBinding}}, Open menu {{.commitMenuKeybinding}}",
 		CommitDescriptionSubTitleNoSwitch:   "Press {{.togglePanelKeyBinding}} to toggle focus",
 		LocalBranchesTitle:                  "Local branches",
 		SearchTitle:                         "Search",

pkg/integration/components/commit_message_panel_driver.go

@@ -74,10 +74,6 @@ func (self *CommitMessagePanelDriver) Cancel() {
 	self.getViewDriver().PressEscape()
 }
 
-func (self *CommitMessagePanelDriver) SwitchToEditor() {
-	self.getViewDriver().Press(self.t.keys.CommitMessage.SwitchToEditor)
-}
-
 func (self *CommitMessagePanelDriver) SelectPreviousMessage() *CommitMessagePanelDriver {
 	self.getViewDriver().SelectPreviousItem()
 	return self