Fix linter warnings (#4352)

- **PR Description**

Fix a few things that started to crop up in my editor recently, probably
because of an updated gopls or something (I didn't investigate more
closely).

pkg/commands/git_commands/deps_test.go

@@ -7,7 +7,6 @@ import (
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -126,26 +125,6 @@ func buildWorkingTreeCommands(deps commonDeps) *WorkingTreeCommands {
 	return NewWorkingTreeCommands(gitCommon, submoduleCommands, fileLoader)
 }
 
-func buildPatchCommands(deps commonDeps) *PatchCommands { //nolint:golint,unused
-	gitCommon := buildGitCommon(deps)
-	rebaseCommands := buildRebaseCommands(deps)
-	commitCommands := buildCommitCommands(deps)
-	statusCommands := buildStatusCommands(deps)
-	stashCommands := buildStashCommands(deps)
-	loadFileFn := func(from string, to string, reverse bool, filename string, plain bool) (string, error) {
-		return "", nil
-	}
-	patchBuilder := patch.NewPatchBuilder(gitCommon.Log, loadFileFn)
-
-	return NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
-}
-
-func buildStatusCommands(deps commonDeps) *StatusCommands { //nolint:golint,unused
-	gitCommon := buildGitCommon(deps)
-
-	return NewStatusCommands(gitCommon)
-}
-
 func buildStashCommands(deps commonDeps) *StashCommands {
 	gitCommon := buildGitCommon(deps)
 	fileLoader := buildFileLoader(gitCommon)

pkg/gui/controllers/basic_commits_controller.go

@@ -37,7 +37,7 @@ func NewBasicCommitsController(c *ControllerCommon, context ContainsCommits) *Ba
 		baseController: baseController{},
 		c:              c,
 		context:        context,
-		ListControllerTrait: NewListControllerTrait[*models.Commit](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			context,
 			context.GetSelected,

pkg/gui/controllers/bisect_controller.go

@@ -26,7 +26,7 @@ func NewBisectController(
 	return &BisectController{
 		baseController: baseController{},
 		c:              c,
-		ListControllerTrait: NewListControllerTrait[*models.Commit](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().LocalCommits,
 			c.Contexts().LocalCommits.GetSelected,

pkg/gui/controllers/branches_controller.go

@@ -28,7 +28,7 @@ func NewBranchesController(
 	return &BranchesController{
 		baseController: baseController{},
 		c:              c,
-		ListControllerTrait: NewListControllerTrait[*models.Branch](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Branches,
 			c.Contexts().Branches.GetSelected,

pkg/gui/controllers/commits_files_controller.go

@@ -30,7 +30,7 @@ func NewCommitFilesController(
 	return &CommitFilesController{
 		baseController: baseController{},
 		c:              c,
-		ListControllerTrait: NewListControllerTrait[*filetree.CommitFileNode](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().CommitFiles,
 			c.Contexts().CommitFiles.GetSelected,

pkg/gui/controllers/files_controller.go

@@ -28,7 +28,7 @@ func NewFilesController(
 ) *FilesController {
 	return &FilesController{
 		c: c,
-		ListControllerTrait: NewListControllerTrait[*filetree.FileNode](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Files,
 			c.Contexts().Files.GetSelected,

pkg/gui/controllers/git_flow_controller.go

@@ -22,7 +22,7 @@ func NewGitFlowController(
 ) *GitFlowController {
 	return &GitFlowController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*models.Branch](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Branches,
 			c.Contexts().Branches.GetSelected,

pkg/gui/controllers/local_commits_controller.go

@@ -44,7 +44,7 @@ func NewLocalCommitsController(
 		baseController: baseController{},
 		c:              c,
 		pullFiles:      pullFiles,
-		ListControllerTrait: NewListControllerTrait[*models.Commit](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().LocalCommits,
 			c.Contexts().LocalCommits.GetSelected,

pkg/gui/controllers/menu_controller.go

@@ -18,7 +18,7 @@ func NewMenuController(
 ) *MenuController {
 	return &MenuController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*types.MenuItem](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Menu,
 			c.Contexts().Menu.GetSelected,

pkg/gui/controllers/reflog_commits_controller.go

@@ -19,7 +19,7 @@ func NewReflogCommitsController(
 ) *ReflogCommitsController {
 	return &ReflogCommitsController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*models.Commit](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().ReflogCommits,
 			c.Contexts().ReflogCommits.GetSelected,

pkg/gui/controllers/remote_branches_controller.go

@@ -22,7 +22,7 @@ func NewRemoteBranchesController(
 ) *RemoteBranchesController {
 	return &RemoteBranchesController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*models.RemoteBranch](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().RemoteBranches,
 			c.Contexts().RemoteBranches.GetSelected,

pkg/gui/controllers/remotes_controller.go

@@ -28,7 +28,7 @@ func NewRemotesController(
 ) *RemotesController {
 	return &RemotesController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*models.Remote](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Remotes,
 			c.Contexts().Remotes.GetSelected,

pkg/gui/controllers/stash_controller.go

@@ -20,7 +20,7 @@ func NewStashController(
 ) *StashController {
 	return &StashController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*models.StashEntry](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Stash,
 			c.Contexts().Stash.GetSelected,

pkg/gui/controllers/sub_commits_controller.go

@@ -20,7 +20,7 @@ func NewSubCommitsController(
 ) *SubCommitsController {
 	return &SubCommitsController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*models.Commit](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().SubCommits,
 			c.Contexts().SubCommits.GetSelected,

pkg/gui/controllers/submodules_controller.go

@@ -27,7 +27,7 @@ func NewSubmodulesController(
 ) *SubmodulesController {
 	return &SubmodulesController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*models.SubmoduleConfig](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Submodules,
 			c.Contexts().Submodules.GetSelected,

pkg/gui/controllers/suggestions_controller.go

@@ -18,7 +18,7 @@ func NewSuggestionsController(
 ) *SuggestionsController {
 	return &SuggestionsController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*types.Suggestion](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Suggestions,
 			c.Contexts().Suggestions.GetSelected,

pkg/gui/controllers/switch_to_sub_commits_controller.go

@@ -28,7 +28,7 @@ func NewSwitchToSubCommitsController(
 ) *SwitchToSubCommitsController {
 	return &SwitchToSubCommitsController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[types.Ref](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			context,
 			context.GetSelectedRef,

pkg/gui/controllers/tags_controller.go

@@ -21,7 +21,7 @@ func NewTagsController(
 ) *TagsController {
 	return &TagsController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*models.Tag](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Tags,
 			c.Contexts().Tags.GetSelected,

pkg/gui/controllers/worktree_options_controller.go

@@ -22,7 +22,7 @@ type WorktreeOptionsController struct {
 func NewWorktreeOptionsController(c *ControllerCommon, context CanViewWorktreeOptions) *WorktreeOptionsController {
 	return &WorktreeOptionsController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[string](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			context,
 			context.GetSelectedItemId,

pkg/gui/controllers/worktrees_controller.go

@@ -25,7 +25,7 @@ func NewWorktreesController(
 ) *WorktreesController {
 	return &WorktreesController{
 		baseController: baseController{},
-		ListControllerTrait: NewListControllerTrait[*models.Worktree](
+		ListControllerTrait: NewListControllerTrait(
 			c,
 			c.Contexts().Worktrees,
 			c.Contexts().Worktrees.GetSelected,