mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-30 23:57:43 +02:00 
			
		
		
		
	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.
This commit is contained in:
		| @@ -90,12 +90,6 @@ func (gui *Gui) resetHelpersAndControllers() { | ||||
| 		modeHelper, | ||||
| 	) | ||||
|  | ||||
| 	setSubCommits := func(commits []*models.Commit) { | ||||
| 		gui.Mutexes.SubCommitsMutex.Lock() | ||||
| 		defer gui.Mutexes.SubCommitsMutex.Unlock() | ||||
|  | ||||
| 		gui.State.Model.SubCommits = commits | ||||
| 	} | ||||
| 	gui.helpers = &helpers.Helpers{ | ||||
| 		Refs:            refsHelper, | ||||
| 		Host:            helpers.NewHostHelper(helperCommon), | ||||
| @@ -135,7 +129,7 @@ func (gui *Gui) resetHelpersAndControllers() { | ||||
| 		), | ||||
| 		Search:     searchHelper, | ||||
| 		Worktree:   worktreeHelper, | ||||
| 		SubCommits: helpers.NewSubCommitsHelper(helperCommon, refreshHelper, setSubCommits), | ||||
| 		SubCommits: helpers.NewSubCommitsHelper(helperCommon, refreshHelper), | ||||
| 	} | ||||
|  | ||||
| 	gui.CustomCommandsClient = custom_commands.NewClient( | ||||
|   | ||||
| @@ -11,18 +11,15 @@ type SubCommitsHelper struct { | ||||
| 	c *HelperCommon | ||||
|  | ||||
| 	refreshHelper *RefreshHelper | ||||
| 	setSubCommits func([]*models.Commit) | ||||
| } | ||||
|  | ||||
| func NewSubCommitsHelper( | ||||
| 	c *HelperCommon, | ||||
| 	refreshHelper *RefreshHelper, | ||||
| 	setSubCommits func([]*models.Commit), | ||||
| ) *SubCommitsHelper { | ||||
| 	return &SubCommitsHelper{ | ||||
| 		c:             c, | ||||
| 		refreshHelper: refreshHelper, | ||||
| 		setSubCommits: setSubCommits, | ||||
| 	} | ||||
| } | ||||
|  | ||||
| @@ -73,3 +70,10 @@ func (self *SubCommitsHelper) ViewSubCommits(opts ViewSubCommitsOpts) error { | ||||
| 	self.c.Context().Push(self.c.Contexts().SubCommits, types.OnFocusOpts{}) | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (self *SubCommitsHelper) setSubCommits(commits []*models.Commit) { | ||||
| 	self.c.Mutexes().SubCommitsMutex.Lock() | ||||
| 	defer self.c.Mutexes().SubCommitsMutex.Unlock() | ||||
|  | ||||
| 	self.c.Model().SubCommits = commits | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user