go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-05 00:59:19 +02:00
Code Issues Releases Activity

Enable revive linter, and fix a bunch of warnings

Browse Source 
I took the set of enabled checks from revive's recommended configuration [1],
and removed some that I didn't like. There might be other useful checks in
revive that we might want to enable, but this is a nice improvement already.

The bulk of the changes here are removing unnecessary else statements after
returns, but there are a few others too.

[1] https://github.com/mgechev/revive?tab=readme-ov-file#recommended-configuration
This commit is contained in:
Stefan Haller
2025-06-30 19:13:12 +02:00
parent 7aa426fa71
commit ca05a2ccea
47 changed files with 152 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/gui/mergeconflicts/merge_conflict.go
View File

@ -50,9 +50,8 @@ func (s Selection) bounds(c *mergeConflict) (int, int) {
case TOP:
if c.hasAncestor() {
return c.start, c.ancestor
} else {
return c.start, c.target
}
return c.start, c.target
case MIDDLE:
return c.ancestor, c.target
case BOTTOM:
@ -72,7 +71,6 @@ func (s Selection) selected(c *mergeConflict, idx int) bool {
func availableSelections(c *mergeConflict) []Selection {
if c.hasAncestor() {
return []Selection{TOP, MIDDLE, BOTTOM}
} else {
return []Selection{TOP, BOTTOM}
}
return []Selection{TOP, BOTTOM}
}