Skip to content

Commit 08751d6

Browse files
authored
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).
2 parents 1b571f9 + 4409738 commit 08751d6

20 files changed

+19
-40
lines changed

pkg/commands/git_commands/deps_test.go

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
gogit "github.com/jesseduffield/go-git/v5"
88
"github.com/jesseduffield/lazygit/pkg/commands/git_config"
99
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
10-
"github.com/jesseduffield/lazygit/pkg/commands/patch"
1110
"github.com/jesseduffield/lazygit/pkg/common"
1211
"github.com/jesseduffield/lazygit/pkg/config"
1312
"github.com/jesseduffield/lazygit/pkg/utils"
@@ -126,26 +125,6 @@ func buildWorkingTreeCommands(deps commonDeps) *WorkingTreeCommands {
126125
return NewWorkingTreeCommands(gitCommon, submoduleCommands, fileLoader)
127126
}
128127

129-
func buildPatchCommands(deps commonDeps) *PatchCommands { //nolint:golint,unused
130-
gitCommon := buildGitCommon(deps)
131-
rebaseCommands := buildRebaseCommands(deps)
132-
commitCommands := buildCommitCommands(deps)
133-
statusCommands := buildStatusCommands(deps)
134-
stashCommands := buildStashCommands(deps)
135-
loadFileFn := func(from string, to string, reverse bool, filename string, plain bool) (string, error) {
136-
return "", nil
137-
}
138-
patchBuilder := patch.NewPatchBuilder(gitCommon.Log, loadFileFn)
139-
140-
return NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
141-
}
142-
143-
func buildStatusCommands(deps commonDeps) *StatusCommands { //nolint:golint,unused
144-
gitCommon := buildGitCommon(deps)
145-
146-
return NewStatusCommands(gitCommon)
147-
}
148-
149128
func buildStashCommands(deps commonDeps) *StashCommands {
150129
gitCommon := buildGitCommon(deps)
151130
fileLoader := buildFileLoader(gitCommon)

pkg/gui/controllers/basic_commits_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func NewBasicCommitsController(c *ControllerCommon, context ContainsCommits) *Ba
3737
baseController: baseController{},
3838
c: c,
3939
context: context,
40-
ListControllerTrait: NewListControllerTrait[*models.Commit](
40+
ListControllerTrait: NewListControllerTrait(
4141
c,
4242
context,
4343
context.GetSelected,

pkg/gui/controllers/bisect_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func NewBisectController(
2626
return &BisectController{
2727
baseController: baseController{},
2828
c: c,
29-
ListControllerTrait: NewListControllerTrait[*models.Commit](
29+
ListControllerTrait: NewListControllerTrait(
3030
c,
3131
c.Contexts().LocalCommits,
3232
c.Contexts().LocalCommits.GetSelected,

pkg/gui/controllers/branches_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func NewBranchesController(
2828
return &BranchesController{
2929
baseController: baseController{},
3030
c: c,
31-
ListControllerTrait: NewListControllerTrait[*models.Branch](
31+
ListControllerTrait: NewListControllerTrait(
3232
c,
3333
c.Contexts().Branches,
3434
c.Contexts().Branches.GetSelected,

pkg/gui/controllers/commits_files_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func NewCommitFilesController(
3030
return &CommitFilesController{
3131
baseController: baseController{},
3232
c: c,
33-
ListControllerTrait: NewListControllerTrait[*filetree.CommitFileNode](
33+
ListControllerTrait: NewListControllerTrait(
3434
c,
3535
c.Contexts().CommitFiles,
3636
c.Contexts().CommitFiles.GetSelected,

pkg/gui/controllers/files_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func NewFilesController(
2828
) *FilesController {
2929
return &FilesController{
3030
c: c,
31-
ListControllerTrait: NewListControllerTrait[*filetree.FileNode](
31+
ListControllerTrait: NewListControllerTrait(
3232
c,
3333
c.Contexts().Files,
3434
c.Contexts().Files.GetSelected,

pkg/gui/controllers/git_flow_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func NewGitFlowController(
2222
) *GitFlowController {
2323
return &GitFlowController{
2424
baseController: baseController{},
25-
ListControllerTrait: NewListControllerTrait[*models.Branch](
25+
ListControllerTrait: NewListControllerTrait(
2626
c,
2727
c.Contexts().Branches,
2828
c.Contexts().Branches.GetSelected,

pkg/gui/controllers/local_commits_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func NewLocalCommitsController(
4444
baseController: baseController{},
4545
c: c,
4646
pullFiles: pullFiles,
47-
ListControllerTrait: NewListControllerTrait[*models.Commit](
47+
ListControllerTrait: NewListControllerTrait(
4848
c,
4949
c.Contexts().LocalCommits,
5050
c.Contexts().LocalCommits.GetSelected,

pkg/gui/controllers/menu_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func NewMenuController(
1818
) *MenuController {
1919
return &MenuController{
2020
baseController: baseController{},
21-
ListControllerTrait: NewListControllerTrait[*types.MenuItem](
21+
ListControllerTrait: NewListControllerTrait(
2222
c,
2323
c.Contexts().Menu,
2424
c.Contexts().Menu.GetSelected,

pkg/gui/controllers/reflog_commits_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func NewReflogCommitsController(
1919
) *ReflogCommitsController {
2020
return &ReflogCommitsController{
2121
baseController: baseController{},
22-
ListControllerTrait: NewListControllerTrait[*models.Commit](
22+
ListControllerTrait: NewListControllerTrait(
2323
c,
2424
c.Contexts().ReflogCommits,
2525
c.Contexts().ReflogCommits.GetSelected,

0 commit comments

Comments
 (0)