standardise controller helper methods

pkg/gui/controllers/common.go

@@ -1,48 +1,20 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 
 type controllerCommon struct {
-	c        *helpers.HelperCommon
-	helpers  *helpers.Helpers
-	contexts *context.ContextTree
-
-	// TODO: use helperCommon's .OS() method instead of this
-	os *oscommands.OSCommand
-	// TODO: use helperCommon's .Git() method instead of this
-	git *commands.GitCommand
-	// TODO: use helperCommon's .Model() method instead of this
-	model *types.Model
-	// TODO: use helperCommon's .Modes() method instead of this
-	modes *types.Modes
-	// TODO: use helperCommon's .Mutexes() method instead of this
-	mutexes *types.Mutexes
+	c       *helpers.HelperCommon
+	helpers *helpers.Helpers
 }
 
 func NewControllerCommon(
 	c *helpers.HelperCommon,
-	os *oscommands.OSCommand,
-	git *commands.GitCommand,
 	helpers *helpers.Helpers,
-	model *types.Model,
-	contexts *context.ContextTree,
-	modes *types.Modes,
-	mutexes *types.Mutexes,
 ) *controllerCommon {
 	return &controllerCommon{
-		c:        c,
-		os:       os,
-		git:      git,
-		helpers:  helpers,
-		model:    model,
-		contexts: contexts,
-		modes:    modes,
-		mutexes:  mutexes,
+		c:       c,
+		helpers: helpers,
 	}
 }