From 5142dc63930ff3444b7df9be7510a546fc36a978 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Thu, 5 Sep 2024 11:13:55 +0200 Subject: [PATCH] Remove return value of OpenCommitMessagePanel Similar to the previous commit: in 100% of the call sites we now need an extra `return nil`. Nevertheless, I still prefer it this way. --- pkg/gui/controllers/custom_patch_options_menu_action.go | 4 +++- pkg/gui/controllers/helpers/commits_helper.go | 3 +-- pkg/gui/controllers/helpers/tags_helper.go | 4 +++- pkg/gui/controllers/helpers/working_tree_helper.go | 4 +++- pkg/gui/controllers/local_commits_controller.go | 8 ++++++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkg/gui/controllers/custom_patch_options_menu_action.go b/pkg/gui/controllers/custom_patch_options_menu_action.go index d279f02e3695..04895ed6b42a 100644 --- a/pkg/gui/controllers/custom_patch_options_menu_action.go +++ b/pkg/gui/controllers/custom_patch_options_menu_action.go @@ -196,7 +196,7 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error { self.returnFocusFromPatchExplorerIfNecessary() commitIndex := self.getPatchCommitIndex() - return self.c.Helpers().Commits.OpenCommitMessagePanel( + self.c.Helpers().Commits.OpenCommitMessagePanel( &helpers.OpenCommitMessagePanelOpts{ // Pass a commit index of one less than the moved-from commit, so that // you can press up arrow once to recall the original commit message: @@ -219,6 +219,8 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error { }, }, ) + + return nil } func (self *CustomPatchOptionsMenuAction) handleApplyPatch(reverse bool) error { diff --git a/pkg/gui/controllers/helpers/commits_helper.go b/pkg/gui/controllers/helpers/commits_helper.go index e50633034fa4..b0f954c2ec76 100644 --- a/pkg/gui/controllers/helpers/commits_helper.go +++ b/pkg/gui/controllers/helpers/commits_helper.go @@ -131,7 +131,7 @@ type OpenCommitMessagePanelOpts struct { InitialMessage string } -func (self *CommitsHelper) OpenCommitMessagePanel(opts *OpenCommitMessagePanelOpts) error { +func (self *CommitsHelper) OpenCommitMessagePanel(opts *OpenCommitMessagePanelOpts) { onConfirm := func(summary string, description string) error { self.CloseCommitMessagePanel() @@ -150,7 +150,6 @@ func (self *CommitsHelper) OpenCommitMessagePanel(opts *OpenCommitMessagePanelOp self.UpdateCommitPanelView(opts.InitialMessage) self.c.Context().Push(self.c.Contexts().CommitMessage) - return nil } func (self *CommitsHelper) OnCommitSuccess() { diff --git a/pkg/gui/controllers/helpers/tags_helper.go b/pkg/gui/controllers/helpers/tags_helper.go index 36d960210acf..aa6ff7740ae7 100644 --- a/pkg/gui/controllers/helpers/tags_helper.go +++ b/pkg/gui/controllers/helpers/tags_helper.go @@ -66,7 +66,7 @@ func (self *TagsHelper) OpenCreateTagPrompt(ref string, onCreate func()) error { return doCreateTag(tagName, description, false) } - return self.commitsHelper.OpenCommitMessagePanel( + self.commitsHelper.OpenCommitMessagePanel( &OpenCommitMessagePanelOpts{ CommitIndex: context.NoCommitIndex, InitialMessage: "", @@ -76,4 +76,6 @@ func (self *TagsHelper) OpenCreateTagPrompt(ref string, onCreate func()) error { OnConfirm: onConfirm, }, ) + + return nil } diff --git a/pkg/gui/controllers/helpers/working_tree_helper.go b/pkg/gui/controllers/helpers/working_tree_helper.go index ad0acc4c9d1a..a6033083a44d 100644 --- a/pkg/gui/controllers/helpers/working_tree_helper.go +++ b/pkg/gui/controllers/helpers/working_tree_helper.go @@ -88,7 +88,7 @@ func (self *WorkingTreeHelper) OpenMergeTool() error { func (self *WorkingTreeHelper) HandleCommitPressWithMessage(initialMessage string) error { return self.WithEnsureCommitableFiles(func() error { - return self.commitsHelper.OpenCommitMessagePanel( + self.commitsHelper.OpenCommitMessagePanel( &OpenCommitMessagePanelOpts{ CommitIndex: context.NoCommitIndex, InitialMessage: initialMessage, @@ -99,6 +99,8 @@ func (self *WorkingTreeHelper) HandleCommitPressWithMessage(initialMessage strin OnSwitchToEditor: self.switchFromCommitMessagePanelToEditor, }, ) + + return nil }) } diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index 50891c1e4ef0..1e2d4c08efad 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -366,7 +366,7 @@ func (self *LocalCommitsController) reword(commit *models.Commit) error { if self.c.UserConfig().Git.Commit.AutoWrapCommitMessage { commitMessage = helpers.TryRemoveHardLineBreaks(commitMessage, self.c.UserConfig().Git.Commit.AutoWrapWidth) } - return self.c.Helpers().Commits.OpenCommitMessagePanel( + self.c.Helpers().Commits.OpenCommitMessagePanel( &helpers.OpenCommitMessagePanelOpts{ CommitIndex: self.context().GetSelectedLineIdx(), InitialMessage: commitMessage, @@ -377,6 +377,8 @@ func (self *LocalCommitsController) reword(commit *models.Commit) error { OnSwitchToEditor: self.switchFromCommitMessagePanelToEditor, }, ) + + return nil } func (self *LocalCommitsController) switchFromCommitMessagePanelToEditor(filepath string) error { @@ -931,7 +933,7 @@ func (self *LocalCommitsController) createAmendCommit(commit *models.Commit, inc commitMessage = helpers.TryRemoveHardLineBreaks(commitMessage, self.c.UserConfig().Git.Commit.AutoWrapWidth) } originalSubject, _, _ := strings.Cut(commitMessage, "\n") - return self.c.Helpers().Commits.OpenCommitMessagePanel( + self.c.Helpers().Commits.OpenCommitMessagePanel( &helpers.OpenCommitMessagePanelOpts{ CommitIndex: self.context().GetSelectedLineIdx(), InitialMessage: commitMessage, @@ -952,6 +954,8 @@ func (self *LocalCommitsController) createAmendCommit(commit *models.Commit, inc OnSwitchToEditor: nil, }, ) + + return nil } func (self *LocalCommitsController) squashFixupCommits() error {