Skip to content

Commit 3a923a3

Browse files
committed
refactor: move common functions to helper
1 parent 703b251 commit 3a923a3

File tree

3 files changed

+36
-55
lines changed

3 files changed

+36
-55
lines changed

pkg/gui/controllers/commit_description_controller.go

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -73,30 +73,5 @@ func (self *CommitDescriptionController) switchToEditor() error {
7373
}
7474

7575
func (self *CommitDescriptionController) openCommitMenu() error {
76-
menuItems := []*types.MenuItem{
77-
{
78-
Label: self.c.Tr.AddCoAuthor,
79-
OnPress: func() error {
80-
return self.addCoAuthor()
81-
},
82-
Key: 'c',
83-
},
84-
}
85-
return self.c.Menu(types.CreateMenuOptions{
86-
Title: self.c.Tr.CommitMenuTitle,
87-
Items: menuItems,
88-
})
89-
}
90-
91-
func (self *CommitDescriptionController) addCoAuthor() error {
92-
return self.c.Prompt(types.PromptOpts{
93-
Title: self.c.Tr.AddCoAuthorPromptTitle,
94-
FindSuggestionsFunc: self.c.Helpers().Suggestions.GetAuthorsSuggestionsFunc(),
95-
HandleConfirm: func(value string) error {
96-
commitMessage := self.c.Helpers().Commits.JoinCommitMessageAndDescription()
97-
coAuthorString := commitMessage + "\nCo-authored-by: " + value
98-
self.c.Helpers().Commits.SetMessageAndDescriptionInView(coAuthorString)
99-
return nil
100-
},
101-
})
76+
return self.c.Helpers().Commits.OpenCommitMenu()
10277
}

pkg/gui/controllers/commit_message_controller.go

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -96,35 +96,6 @@ func (self *CommitMessageController) switchToEditor() error {
9696
return self.c.Helpers().Commits.SwitchToEditor()
9797
}
9898

99-
func (self *CommitMessageController) openCommitMenu() error {
100-
menuItems := []*types.MenuItem{
101-
{
102-
Label: self.c.Tr.AddCoAuthor,
103-
OnPress: func() error {
104-
return self.addCoAuthor()
105-
},
106-
Key: 'c',
107-
},
108-
}
109-
return self.c.Menu(types.CreateMenuOptions{
110-
Title: self.c.Tr.CommitMenuTitle,
111-
Items: menuItems,
112-
})
113-
}
114-
115-
func (self *CommitMessageController) addCoAuthor() error {
116-
return self.c.Prompt(types.PromptOpts{
117-
Title: self.c.Tr.AddCoAuthorPromptTitle,
118-
FindSuggestionsFunc: self.c.Helpers().Suggestions.GetAuthorsSuggestionsFunc(),
119-
HandleConfirm: func(value string) error {
120-
commitMessage := self.c.Helpers().Commits.JoinCommitMessageAndDescription()
121-
coAuthorString := commitMessage + "\nCo-authored-by: " + value
122-
self.c.Helpers().Commits.SetMessageAndDescriptionInView(coAuthorString)
123-
return nil
124-
},
125-
})
126-
}
127-
12899
func (self *CommitMessageController) handleCommitIndexChange(value int) error {
129100
currentIndex := self.context().GetSelectedIndex()
130101
newIndex := currentIndex + value
@@ -163,3 +134,7 @@ func (self *CommitMessageController) confirm() error {
163134
func (self *CommitMessageController) close() error {
164135
return self.c.Helpers().Commits.CloseCommitMessagePanel()
165136
}
137+
138+
func (self *CommitMessageController) openCommitMenu() error {
139+
return self.c.Helpers().Commits.OpenCommitMenu()
140+
}

pkg/gui/controllers/helpers/commits_helper.go

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,3 +191,34 @@ func (self *CommitsHelper) commitMessageContexts() []types.Context {
191191
self.c.Contexts().CommitMessage,
192192
}
193193
}
194+
195+
func (self *CommitsHelper) OpenCommitMenu() error {
196+
menuItems := []*types.MenuItem{
197+
{
198+
Label: self.c.Tr.AddCoAuthor,
199+
OnPress: func() error {
200+
return self.addCoAuthor()
201+
},
202+
Key: 'c',
203+
},
204+
}
205+
return self.c.Menu(types.CreateMenuOptions{
206+
Title: self.c.Tr.CommitMenuTitle,
207+
Items: menuItems,
208+
})
209+
}
210+
211+
func (self *CommitsHelper) addCoAuthor() error {
212+
suggestionHelper := &SuggestionsHelper{}
213+
214+
return self.c.Prompt(types.PromptOpts{
215+
Title: self.c.Tr.AddCoAuthorPromptTitle,
216+
FindSuggestionsFunc: suggestionHelper.GetAuthorsSuggestionsFunc(),
217+
HandleConfirm: func(value string) error {
218+
commitMessage := self.JoinCommitMessageAndDescription()
219+
coAuthorString := commitMessage + "\nCo-authored-by: " + value
220+
self.SetMessageAndDescriptionInView(coAuthorString)
221+
return nil
222+
},
223+
})
224+
}

0 commit comments

Comments
 (0)