Skip to content

Commit 33a4fdf

Browse files
committed
Remove unnecessary setSubCommits indirection
I don't know why this function argument was added, but I don't like unnecessary indirections, so I'm removing it as SubCommitsHelper has access to everything it needs to do it itself.
1 parent e1d728e commit 33a4fdf

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

pkg/gui/controllers.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ func (gui *Gui) resetHelpersAndControllers() {
9090
modeHelper,
9191
)
9292

93-
setSubCommits := func(commits []*models.Commit) {
94-
gui.Mutexes.SubCommitsMutex.Lock()
95-
defer gui.Mutexes.SubCommitsMutex.Unlock()
96-
97-
gui.State.Model.SubCommits = commits
98-
}
9993
gui.helpers = &helpers.Helpers{
10094
Refs: refsHelper,
10195
Host: helpers.NewHostHelper(helperCommon),
@@ -135,7 +129,7 @@ func (gui *Gui) resetHelpersAndControllers() {
135129
),
136130
Search: searchHelper,
137131
Worktree: worktreeHelper,
138-
SubCommits: helpers.NewSubCommitsHelper(helperCommon, refreshHelper, setSubCommits),
132+
SubCommits: helpers.NewSubCommitsHelper(helperCommon, refreshHelper),
139133
}
140134

141135
gui.CustomCommandsClient = custom_commands.NewClient(

pkg/gui/controllers/helpers/sub_commits_helper.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,15 @@ type SubCommitsHelper struct {
1111
c *HelperCommon
1212

1313
refreshHelper *RefreshHelper
14-
setSubCommits func([]*models.Commit)
1514
}
1615

1716
func NewSubCommitsHelper(
1817
c *HelperCommon,
1918
refreshHelper *RefreshHelper,
20-
setSubCommits func([]*models.Commit),
2119
) *SubCommitsHelper {
2220
return &SubCommitsHelper{
2321
c: c,
2422
refreshHelper: refreshHelper,
25-
setSubCommits: setSubCommits,
2623
}
2724
}
2825

@@ -73,3 +70,10 @@ func (self *SubCommitsHelper) ViewSubCommits(opts ViewSubCommitsOpts) error {
7370
self.c.Context().Push(self.c.Contexts().SubCommits, types.OnFocusOpts{})
7471
return nil
7572
}
73+
74+
func (self *SubCommitsHelper) setSubCommits(commits []*models.Commit) {
75+
self.c.Mutexes().SubCommitsMutex.Lock()
76+
defer self.c.Mutexes().SubCommitsMutex.Unlock()
77+
78+
self.c.Model().SubCommits = commits
79+
}

0 commit comments

Comments
 (0)