From a4d6d020c4e33109bf1f203869c91726a07629bb Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Mon, 3 Mar 2025 21:23:01 +0100 Subject: [PATCH 1/2] Remove unused functions For some reason the //nolint:golint,unused comment no longer seems to work after I updated gopls (I think). But I also don't understand why we mark unused stuff with linter comments instead of just getting rid of it. --- pkg/commands/git_commands/deps_test.go | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pkg/commands/git_commands/deps_test.go b/pkg/commands/git_commands/deps_test.go index a7412bd38..78990a55e 100644 --- a/pkg/commands/git_commands/deps_test.go +++ b/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) From 44097384d30df7e7a6733ca931a23a80fab41e6b Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Mon, 3 Mar 2025 21:23:46 +0100 Subject: [PATCH 2/2] Remove unnecessary type arguments I'm getting warnings in my editor about these, probably because of an updated gopls again. --- pkg/gui/controllers/basic_commits_controller.go | 2 +- pkg/gui/controllers/bisect_controller.go | 2 +- pkg/gui/controllers/branches_controller.go | 2 +- pkg/gui/controllers/commits_files_controller.go | 2 +- pkg/gui/controllers/files_controller.go | 2 +- pkg/gui/controllers/git_flow_controller.go | 2 +- pkg/gui/controllers/local_commits_controller.go | 2 +- pkg/gui/controllers/menu_controller.go | 2 +- pkg/gui/controllers/reflog_commits_controller.go | 2 +- pkg/gui/controllers/remote_branches_controller.go | 2 +- pkg/gui/controllers/remotes_controller.go | 2 +- pkg/gui/controllers/stash_controller.go | 2 +- pkg/gui/controllers/sub_commits_controller.go | 2 +- pkg/gui/controllers/submodules_controller.go | 2 +- pkg/gui/controllers/suggestions_controller.go | 2 +- pkg/gui/controllers/switch_to_sub_commits_controller.go | 2 +- pkg/gui/controllers/tags_controller.go | 2 +- pkg/gui/controllers/worktree_options_controller.go | 2 +- pkg/gui/controllers/worktrees_controller.go | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/gui/controllers/basic_commits_controller.go b/pkg/gui/controllers/basic_commits_controller.go index 8aa4c8048..c98f8bab2 100644 --- a/pkg/gui/controllers/basic_commits_controller.go +++ b/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, diff --git a/pkg/gui/controllers/bisect_controller.go b/pkg/gui/controllers/bisect_controller.go index ee4b6aecf..892493d7b 100644 --- a/pkg/gui/controllers/bisect_controller.go +++ b/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, diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index 244092681..b164407e7 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/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, diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go index 0e54fb25b..09f8e54b0 100644 --- a/pkg/gui/controllers/commits_files_controller.go +++ b/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, diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 34065bf33..ede3a32c4 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/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, diff --git a/pkg/gui/controllers/git_flow_controller.go b/pkg/gui/controllers/git_flow_controller.go index bdc0cad32..cf996e5d9 100644 --- a/pkg/gui/controllers/git_flow_controller.go +++ b/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, diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index 3d9bf7265..7e3fa083f 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/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, diff --git a/pkg/gui/controllers/menu_controller.go b/pkg/gui/controllers/menu_controller.go index f1a17f651..8baf9104e 100644 --- a/pkg/gui/controllers/menu_controller.go +++ b/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, diff --git a/pkg/gui/controllers/reflog_commits_controller.go b/pkg/gui/controllers/reflog_commits_controller.go index 6ccc32a2b..4596ad080 100644 --- a/pkg/gui/controllers/reflog_commits_controller.go +++ b/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, diff --git a/pkg/gui/controllers/remote_branches_controller.go b/pkg/gui/controllers/remote_branches_controller.go index 74e31cd01..39e09a12a 100644 --- a/pkg/gui/controllers/remote_branches_controller.go +++ b/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, diff --git a/pkg/gui/controllers/remotes_controller.go b/pkg/gui/controllers/remotes_controller.go index 6942e11a8..d8a467eb0 100644 --- a/pkg/gui/controllers/remotes_controller.go +++ b/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, diff --git a/pkg/gui/controllers/stash_controller.go b/pkg/gui/controllers/stash_controller.go index f05fd8c9b..002c68b3d 100644 --- a/pkg/gui/controllers/stash_controller.go +++ b/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, diff --git a/pkg/gui/controllers/sub_commits_controller.go b/pkg/gui/controllers/sub_commits_controller.go index 69024da84..0dfd5d653 100644 --- a/pkg/gui/controllers/sub_commits_controller.go +++ b/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, diff --git a/pkg/gui/controllers/submodules_controller.go b/pkg/gui/controllers/submodules_controller.go index 69c87b94c..44fd9d949 100644 --- a/pkg/gui/controllers/submodules_controller.go +++ b/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, diff --git a/pkg/gui/controllers/suggestions_controller.go b/pkg/gui/controllers/suggestions_controller.go index f6b3b0463..4737bdec8 100644 --- a/pkg/gui/controllers/suggestions_controller.go +++ b/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, diff --git a/pkg/gui/controllers/switch_to_sub_commits_controller.go b/pkg/gui/controllers/switch_to_sub_commits_controller.go index 70fe573d7..3df7ddee8 100644 --- a/pkg/gui/controllers/switch_to_sub_commits_controller.go +++ b/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, diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go index 8a207478e..75db8a6a6 100644 --- a/pkg/gui/controllers/tags_controller.go +++ b/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, diff --git a/pkg/gui/controllers/worktree_options_controller.go b/pkg/gui/controllers/worktree_options_controller.go index e158be3b1..0cdf4d008 100644 --- a/pkg/gui/controllers/worktree_options_controller.go +++ b/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, diff --git a/pkg/gui/controllers/worktrees_controller.go b/pkg/gui/controllers/worktrees_controller.go index b81cc5467..61066d533 100644 --- a/pkg/gui/controllers/worktrees_controller.go +++ b/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,