From 454d4c641d37f82c2944c4b4126b5f368bcf43b1 Mon Sep 17 00:00:00 2001 From: Abhishek Keshri Date: Mon, 4 Dec 2023 00:47:07 +0530 Subject: [PATCH] fix: use suggestion function from controller --- pkg/gui/controllers/commit_description_controller.go | 3 ++- pkg/gui/controllers/commit_message_controller.go | 3 ++- pkg/gui/controllers/helpers/commits_helper.go | 10 ++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/gui/controllers/commit_description_controller.go b/pkg/gui/controllers/commit_description_controller.go index ee0413d128b..054bb0fb776 100644 --- a/pkg/gui/controllers/commit_description_controller.go +++ b/pkg/gui/controllers/commit_description_controller.go @@ -65,5 +65,6 @@ func (self *CommitDescriptionController) confirm() error { } func (self *CommitDescriptionController) openCommitMenu() error { - return self.c.Helpers().Commits.OpenCommitMenu() + authorSuggestion := self.c.Helpers().Suggestions.GetAuthorsSuggestionsFunc() + return self.c.Helpers().Commits.OpenCommitMenu(authorSuggestion) } diff --git a/pkg/gui/controllers/commit_message_controller.go b/pkg/gui/controllers/commit_message_controller.go index 7e687ddf9e4..5d6dc26dc52 100644 --- a/pkg/gui/controllers/commit_message_controller.go +++ b/pkg/gui/controllers/commit_message_controller.go @@ -128,5 +128,6 @@ func (self *CommitMessageController) close() error { } func (self *CommitMessageController) openCommitMenu() error { - return self.c.Helpers().Commits.OpenCommitMenu() + authorSuggestion := self.c.Helpers().Suggestions.GetAuthorsSuggestionsFunc() + return self.c.Helpers().Commits.OpenCommitMenu(authorSuggestion) } diff --git a/pkg/gui/controllers/helpers/commits_helper.go b/pkg/gui/controllers/helpers/commits_helper.go index 146591c4748..730771d5521 100644 --- a/pkg/gui/controllers/helpers/commits_helper.go +++ b/pkg/gui/controllers/helpers/commits_helper.go @@ -192,12 +192,12 @@ func (self *CommitsHelper) commitMessageContexts() []types.Context { } } -func (self *CommitsHelper) OpenCommitMenu() error { +func (self *CommitsHelper) OpenCommitMenu(suggestionFunc func(string) []*types.Suggestion) error { menuItems := []*types.MenuItem{ { Label: self.c.Tr.AddCoAuthor, OnPress: func() error { - return self.addCoAuthor() + return self.addCoAuthor(suggestionFunc) }, Key: 'c', }, @@ -215,12 +215,10 @@ func (self *CommitsHelper) OpenCommitMenu() error { }) } -func (self *CommitsHelper) addCoAuthor() error { - suggestionHelper := &SuggestionsHelper{} - +func (self *CommitsHelper) addCoAuthor(suggestionFunc func(string) []*types.Suggestion) error { return self.c.Prompt(types.PromptOpts{ Title: self.c.Tr.AddCoAuthorPromptTitle, - FindSuggestionsFunc: suggestionHelper.GetAuthorsSuggestionsFunc(), + FindSuggestionsFunc: suggestionFunc, HandleConfirm: func(value string) error { commitMessage := self.JoinCommitMessageAndDescription() coAuthorString := commitMessage + "\nCo-authored-by: " + value