feat: add support for coauthors on new commit

feat: add support for commit coauthors
feat: add coauthor support to commit description
feat: keep current message when adding co author
feat: update copy to include coauthors binding
feat: enhance commit message copy
test: fix coauthor tests

Author: 2KAbhishek

pkg/commands/git_commands/commit.go

@@ -45,7 +45,7 @@ func (self *CommitCommands) AddCoAuthor(sha string, value string) error {
 		return err
 	}
 
-	message = message + fmt.Sprintf("\nCo-authored-by: %s", value)
+	message = message + fmt.Sprintf("\n\nCo-authored-by: %s", value)
 
 	cmdArgs := NewGitCmd("commit").
 		Arg("--allow-empty", "--amend", "--only", "-m", message).

pkg/config/user_config.go

@@ -441,6 +441,7 @@ type KeybindingSubmodulesConfig struct {
 
 type KeybindingCommitMessageConfig struct {
 	SwitchToEditor string `yaml:"switchToEditor"`
+	AddCoAuthor    string `yaml:"addCoAuthor"`
 }
 
 // OSConfig contains config on the level of the os
@@ -830,6 +831,7 @@ func GetDefaultConfig() *UserConfig {
 			},
 			CommitMessage: KeybindingCommitMessageConfig{
 				SwitchToEditor: "<c-o>",
+				AddCoAuthor:    "<c-e>",
 			},
 		},
 		OS:                           OSConfig{},

pkg/gui/context/commit_message_context.go

@@ -117,6 +117,7 @@ func (self *CommitMessageContext) SetPanelState(
 		map[string]string{
 			"togglePanelKeyBinding":    keybindings.Label(self.c.UserConfig.Keybinding.Universal.TogglePanel),
 			"switchToEditorKeyBinding": keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.SwitchToEditor),
+			"addCoAuthorKeyBinding":    keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.AddCoAuthor),
 		})
 }
 

pkg/gui/controllers/commit_description_controller.go

@@ -39,6 +39,10 @@ func (self *CommitDescriptionController) GetKeybindings(opts types.KeybindingsOp
 			Key:     opts.GetKey(opts.Config.CommitMessage.SwitchToEditor),
 			Handler: self.switchToEditor,
 		},
+		{
+			Key:     opts.GetKey(opts.Config.CommitMessage.AddCoAuthor),
+			Handler: self.addCoAuthor,
+		},
 	}
 
 	return bindings
@@ -67,3 +71,16 @@ func (self *CommitDescriptionController) confirm() error {
 func (self *CommitDescriptionController) switchToEditor() error {
 	return self.c.Helpers().Commits.SwitchToEditor()
 }
+
+func (self *CommitDescriptionController) addCoAuthor() error {
+	return self.c.Prompt(types.PromptOpts{
+		Title:               self.c.Tr.AddCoAuthorPromptTitle,
+		FindSuggestionsFunc: self.c.Helpers().Suggestions.GetAuthorsSuggestionsFunc(),
+		HandleConfirm: func(value string) error {
+			commitMessage := self.c.Helpers().Commits.JoinCommitMessageAndDescription()
+			coAuthorString := commitMessage + "\nCo-authored-by: " + value
+			self.c.Helpers().Commits.SetMessageAndDescriptionInView(coAuthorString)
+			return nil
+		},
+	})
+}

pkg/gui/controllers/commit_message_controller.go

@@ -50,6 +50,10 @@ func (self *CommitMessageController) GetKeybindings(opts types.KeybindingsOpts)
 			Key:     opts.GetKey(opts.Config.CommitMessage.SwitchToEditor),
 			Handler: self.switchToEditor,
 		},
+		{
+			Key:     opts.GetKey(opts.Config.CommitMessage.AddCoAuthor),
+			Handler: self.addCoAuthor,
+		},
 	}
 
 	return bindings
@@ -92,6 +96,19 @@ func (self *CommitMessageController) switchToEditor() error {
 	return self.c.Helpers().Commits.SwitchToEditor()
 }
 
+func (self *CommitMessageController) addCoAuthor() error {
+	return self.c.Prompt(types.PromptOpts{
+		Title:               self.c.Tr.AddCoAuthorPromptTitle,
+		FindSuggestionsFunc: self.c.Helpers().Suggestions.GetAuthorsSuggestionsFunc(),
+		HandleConfirm: func(value string) error {
+			commitMessage := self.c.Helpers().Commits.JoinCommitMessageAndDescription()
+			coAuthorString := commitMessage + "\nCo-authored-by: " + value
+			self.c.Helpers().Commits.SetMessageAndDescriptionInView(coAuthorString)
+			return nil
+		},
+	})
+}
+
 func (self *CommitMessageController) handleCommitIndexChange(value int) error {
 	currentIndex := self.context().GetSelectedIndex()
 	newIndex := currentIndex + value

pkg/i18n/english.go

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

pkg/integration/tests/commit/add_co_author.go

@@ -33,7 +33,6 @@ var AddCoAuthor = NewIntegrationTest(NewIntegrationTestArgs{
 			})
 
 		t.Views().Main().ContainsLines(
-			Contains("initial commit"),
 			Contains("Co-authored-by: John Smith <[email protected]>"),
 		)
 	},