Enable revive linter, and fix a bunch of warnings

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

.golangci.yml

@@ -11,6 +11,7 @@ linters:
     - nakedret
     - nolintlint
     - prealloc
+    - revive
     - thelper
     - tparallel
     - unconvert
@@ -76,6 +77,20 @@ linters:
 
       dot-import-whitelist:
         - github.com/jesseduffield/lazygit/pkg/integration/components
+    revive:
+      severity: warning
+      rules:
+        - name: atomic
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: error-naming
+        - name: var-declaration
+        - name: package-comments
+        - name: range
+        - name: time-naming
+        - name: indent-error-flow
+        - name: errorf
+        - name: superfluous-else
   exclusions:
     generated: lax
     presets:

pkg/app/app.go

@@ -86,9 +86,9 @@ func newLogger(cfg config.AppConfigurer) *logrus.Entry {
 			log.Fatal(err)
 		}
 		return logs.NewDevelopmentLogger(logPath)
-	} else {
-		return logs.NewProductionLogger()
 	}
+
+	return logs.NewProductionLogger()
 }
 
 // NewApp bootstrap a new application

pkg/app/daemon/rebase.go

@@ -21,9 +21,8 @@ type TodoLine struct {
 func (self *TodoLine) ToString() string {
 	if self.Action == "break" {
 		return self.Action + "\n"
-	} else {
-		return self.Action + " " + self.Commit.Hash() + " " + self.Commit.Name + "\n"
 	}
+	return self.Action + " " + self.Commit.Hash() + " " + self.Commit.Name + "\n"
 }
 
 func TodoLinesToString(todoLines []TodoLine) string {

pkg/commands/git_commands/branch_loader.go

@@ -356,9 +356,8 @@ func parseDifference(track string, regexStr string) string {
 	match := re.FindStringSubmatch(track)
 	if len(match) > 1 {
 		return match[1]
-	} else {
-		return "0"
 	}
+	return "0"
 }
 
 // TODO: only look at the new reflog commits, and otherwise store the recencies in

pkg/commands/git_commands/commit.go

@@ -149,9 +149,8 @@ func (self *CommitCommands) CommitEditorCmdObj() *oscommands.CmdObj {
 func (self *CommitCommands) signoffFlag() string {
 	if self.UserConfig().Git.Commit.SignOff {
 		return "--signoff"
-	} else {
-		return ""
 	}
+	return ""
 }
 
 func (self *CommitCommands) GetCommitMessage(commitHash string) (string, error) {

pkg/commands/git_commands/deps_test.go

@@ -97,7 +97,7 @@ func buildGitCommon(deps commonDeps) *GitCommon {
 
 func buildRepo() *gogit.Repository {
 	// TODO: think of a way to actually mock this out
-	var repo *gogit.Repository = nil
+	var repo *gogit.Repository
 	return repo
 }
 

pkg/commands/git_commands/git_command_builder.go

@@ -32,9 +32,8 @@ func (self *GitCommandBuilder) ArgIf(condition bool, ifTrue ...string) *GitComma
 func (self *GitCommandBuilder) ArgIfElse(condition bool, ifTrue string, ifFalse string) *GitCommandBuilder {
 	if condition {
 		return self.Arg(ifTrue)
-	} else {
-		return self.Arg(ifFalse)
 	}
+	return self.Arg(ifFalse)
 }
 
 func (self *GitCommandBuilder) Config(value string) *GitCommandBuilder {

pkg/commands/git_commands/rebase.go

@@ -327,9 +327,8 @@ func (self *RebaseCommands) MoveFixupCommitDown(commits []*models.Commit, target
 func todoFromCommit(commit *models.Commit) utils.Todo {
 	if commit.Action == todo.UpdateRef {
 		return utils.Todo{Ref: commit.Name}
-	} else {
-		return utils.Todo{Hash: commit.Hash()}
 	}
+	return utils.Todo{Hash: commit.Hash()}
 }
 
 // Sets the action for the given commits in the git-rebase-todo file
@@ -412,9 +411,9 @@ func (self *RebaseCommands) BeginInteractiveRebaseForCommit(
 			instruction:                daemon.NewInsertBreakInstruction(),
 			keepCommitsThatBecomeEmpty: keepCommitsThatBecomeEmpty,
 		}).Run()
-	} else {
-		return self.BeginInteractiveRebaseForCommitRange(commits, commitIndex, commitIndex, keepCommitsThatBecomeEmpty)
 	}
+
+	return self.BeginInteractiveRebaseForCommitRange(commits, commitIndex, commitIndex, keepCommitsThatBecomeEmpty)
 }
 
 func (self *RebaseCommands) BeginInteractiveRebaseForCommitRange(
@@ -574,7 +573,7 @@ func getBaseHashOrRoot(commits []*models.Commit, index int) string {
 	// at time of writing)
 	if index < len(commits) {
 		return commits[index].Hash()
-	} else {
-		return "--root"
 	}
+
+	return "--root"
 }

pkg/commands/git_commands/repo_paths.go

@@ -21,7 +21,7 @@ type RepoPaths struct {
 	isBareRepo         bool
 }
 
-var gitPathFormatVersion GitVersion = GitVersion{2, 31, 0, ""}
+var gitPathFormatVersion = GitVersion{2, 31, 0, ""}
 
 // Path to the current worktree. If we're in the main worktree, this will
 // be the same as RepoPath()

pkg/commands/git_commands/repo_paths_test.go

@@ -184,9 +184,7 @@ func TestGetRepoPaths(t *testing.T) {
 			Expected: nil,
 			Err: func(getRevParseArgs argFn) error {
 				args := strings.Join(getRevParseArgs(), " ")
-				return errors.New(
-					fmt.Sprintf("'git %v --show-toplevel --absolute-git-dir --git-common-dir --is-bare-repository --show-superproject-working-tree' failed: fatal: invalid gitfile format: /path/to/repo/worktree2/.git", args),
-				)
+				return fmt.Errorf("'git %v --show-toplevel --absolute-git-dir --git-common-dir --is-bare-repository --show-superproject-working-tree' failed: fatal: invalid gitfile format: /path/to/repo/worktree2/.git", args)
 			},
 		},
 	}

pkg/commands/git_commands/submodule.go

@@ -49,9 +49,8 @@ func (self *SubmoduleCommands) GetConfigs(parentModule *models.SubmoduleConfig)
 
 		if len(matches) > 0 {
 			return matches[1], true
-		} else {
-			return "", false
 		}
+		return "", false
 	}
 
 	configs := []*models.SubmoduleConfig{}

pkg/commands/git_commands/working_tree.go

@@ -66,9 +66,8 @@ func (self *WorkingTreeCommands) UnstageAll() error {
 func (self *WorkingTreeCommands) UnStageFile(paths []string, tracked bool) error {
 	if tracked {
 		return self.UnstageTrackedFiles(paths)
-	} else {
-		return self.UnstageUntrackedFiles(paths)
 	}
+	return self.UnstageUntrackedFiles(paths)
 }
 
 func (self *WorkingTreeCommands) UnstageTrackedFiles(paths []string) error {

pkg/commands/hosting_service/hosting_service.go

@@ -46,9 +46,8 @@ func (self *HostingServiceMgr) GetPullRequestURL(from string, to string) (string
 
 	if to == "" {
 		return gitService.getPullRequestURLIntoDefaultBranch(url.QueryEscape(from)), nil
-	} else {
-		return gitService.getPullRequestURLIntoTargetBranch(url.QueryEscape(from), url.QueryEscape(to)), nil
 	}
+	return gitService.getPullRequestURLIntoTargetBranch(url.QueryEscape(from), url.QueryEscape(to)), nil
 }
 
 func (self *HostingServiceMgr) GetCommitURL(commitHash string) (string, error) {

pkg/commands/patch/patch_builder.go

@@ -211,9 +211,8 @@ func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string {
 
 	if opts.Plain {
 		return patch.FormatPlain()
-	} else {
-		return patch.FormatView(FormatViewOpts{})
 	}
+	return patch.FormatView(FormatViewOpts{})
 }
 
 func (p *PatchBuilder) renderEachFilePatch(plain bool) []string {

pkg/commands/patch/transform.go

@@ -84,9 +84,9 @@ func (self *patchTransformer) transformHeader() []string {
 			result = append(result, line)
 		}
 		return result
-	} else {
-		return self.patch.header
 	}
+
+	return self.patch.header
 }
 
 func (self *patchTransformer) transformHunks() []*Hunk {

pkg/gui/context/menu_context.go

@@ -144,7 +144,7 @@ func (self *MenuViewModel) GetNonModelItems() []*NonModelItem {
 	}
 
 	menuItems := self.FilteredListViewModel.GetItems()
-	var prevSection *types.MenuSection = nil
+	var prevSection *types.MenuSection
 	for i, menuItem := range menuItems {
 		if menuItem.Section != nil && menuItem.Section != prevSection {
 			if prevSection != nil {

pkg/gui/context/suggestions_context.go

@@ -79,9 +79,8 @@ func (self *SuggestionsContext) RefreshSuggestions() {
 		if findSuggestionsFn != nil {
 			suggestions := findSuggestionsFn(self.c.GetPromptInput())
 			return func() { self.SetSuggestions(suggestions) }
-		} else {
-			return func() {}
 		}
+		return func() {}
 	})
 }
 

pkg/gui/context/traits/list_cursor.go

@@ -77,9 +77,8 @@ func (self *ListCursor) SetSelectionRangeAndMode(selectedIdx, rangeStartIdx int,
 func (self *ListCursor) GetSelectionRangeAndMode() (int, int, RangeSelectMode) {
 	if self.IsSelectingRange() {
 		return self.selectedIdx, self.rangeStartIdx, self.rangeSelectMode
-	} else {
-		return self.selectedIdx, self.selectedIdx, self.rangeSelectMode
 	}
+	return self.selectedIdx, self.selectedIdx, self.rangeSelectMode
 }
 
 func (self *ListCursor) clampValue(value int) int {

pkg/gui/context_config.go

@@ -24,7 +24,7 @@ func OnFocusWrapper(f func() error) func(opts types.OnFocusOpts) error {
 func (gui *Gui) defaultSideContext() types.Context {
 	if gui.State.Modes.Filtering.Active() {
 		return gui.State.Contexts.LocalCommits
-	} else {
-		return gui.State.Contexts.Files
 	}
+
+	return gui.State.Contexts.Files
 }

pkg/gui/controllers/bisect_controller.go

@@ -54,9 +54,8 @@ func (self *BisectController) openMenu(commit *models.Commit) error {
 	info := self.c.Git().Bisect.GetInfo()
 	if info.Started() {
 		return self.openMidBisectMenu(info, commit)
-	} else {
-		return self.openStartBisectMenu(info, commit)
 	}
+	return self.openStartBisectMenu(info, commit)
 }
 
 func (self *BisectController) openMidBisectMenu(info *git_commands.BisectInfo, commit *models.Commit) error {
@@ -280,11 +279,11 @@ func (self *BisectController) afterBisectMarkRefresh(selectCurrent bool, waitToR
 
 	if waitToReselect {
 		return self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{}, Then: selectFn})
-	} else {
-		_ = selectFn()
-
-		return self.c.Helpers().Bisect.PostBisectCommandRefresh()
 	}
+
+	_ = selectFn()
+
+	return self.c.Helpers().Bisect.PostBisectCommandRefresh()
 }
 
 func (self *BisectController) selectCurrentBisectCommit() {

pkg/gui/controllers/branches_controller.go

@@ -657,15 +657,15 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
 			)
 			_ = self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
 			return err
-		} else {
-			self.c.LogAction(action)
-
-			err := self.c.Git().Sync.FastForward(
-				task, branch.Name, branch.UpstreamRemote, branch.UpstreamBranch,
-			)
-			_ = self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}})
-			return err
 		}
+
+		self.c.LogAction(action)
+
+		err := self.c.Git().Sync.FastForward(
+			task, branch.Name, branch.UpstreamRemote, branch.UpstreamBranch,
+		)
+		_ = self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}})
+		return err
 	})
 }
 

pkg/gui/controllers/custom_patch_options_menu_action.go

@@ -189,9 +189,9 @@ func (self *CustomPatchOptionsMenuAction) handleMovePatchIntoWorkingTree() error
 		})
 
 		return nil
-	} else {
-		return pull(false)
 	}
+
+	return pull(false)
 }
 
 func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {

pkg/gui/controllers/files_controller.go

@@ -901,11 +901,10 @@ func (self *FilesController) setStatusFiltering(filter filetree.FileTreeDisplayF
 	// because the untracked files filter applies when running `git status`.
 	if previousFilter != filter && (previousFilter == filetree.DisplayUntracked || filter == filetree.DisplayUntracked) {
 		return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}, Mode: types.ASYNC})
-	} else {
-		self.c.PostRefreshUpdate(self.context())
-
-		return nil
 	}
+
+	self.c.PostRefreshUpdate(self.context())
+	return nil
 }
 
 func (self *FilesController) edit(nodes []*filetree.FileNode) error {

pkg/gui/controllers/helpers/gpg_helper.go

@@ -37,9 +37,9 @@ func (self *GpgHelper) WithGpgHandling(cmdObj *oscommands.CmdObj, configKey git_
 		}
 
 		return err
-	} else {
-		return self.runAndStream(cmdObj, waitingStatus, onSuccess, refreshScope)
 	}
+
+	return self.runAndStream(cmdObj, waitingStatus, onSuccess, refreshScope)
 }
 
 func (self *GpgHelper) runAndStream(cmdObj *oscommands.CmdObj, waitingStatus string, onSuccess func() error, refreshScope []types.RefreshableView) error {

pkg/gui/controllers/helpers/merge_and_rebase_helper.go

@@ -162,9 +162,8 @@ func (self *MergeAndRebaseHelper) CheckMergeOrRebaseWithRefreshOptions(result er
 	} else if strings.Contains(result.Error(), "No rebase in progress?") {
 		// assume in this case that we're already done
 		return nil
-	} else {
-		return self.CheckForConflicts(result)
 	}
+	return self.CheckForConflicts(result)
 }
 
 func (self *MergeAndRebaseHelper) CheckMergeOrRebase(result error) error {

pkg/gui/controllers/helpers/refs_helper.go

@@ -56,9 +56,9 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
 	withCheckoutStatus := func(f func(gocui.Task) error) error {
 		if found {
 			return self.c.WithInlineStatus(localBranch, types.ItemOperationCheckingOut, context.LOCAL_BRANCHES_CONTEXT_KEY, f)
-		} else {
-			return self.c.WithWaitingStatus(waitingStatus, f)
 		}
+
+		return self.c.WithWaitingStatus(waitingStatus, f)
 	}
 
 	return withCheckoutStatus(func(gocui.Task) error {

pkg/gui/controllers/helpers/window_arrangement_helper.go

@@ -385,9 +385,8 @@ func splitMainPanelSideBySide(args WindowArrangementArgs) bool {
 	default:
 		if args.Width < 200 && args.Height > 30 { // 2 80 character width panels + 40 width for side panel
 			return false
-		} else {
-			return true
 		}
+		return true
 	}
 }
 
@@ -431,11 +430,11 @@ func sidePanelChildren(args WindowArrangementArgs) func(width int, height int) [
 						Window: window,
 						Weight: 1,
 					}
-				} else {
-					return &boxlayout.Box{
-						Window: window,
-						Size:   0,
-					}
+				}
+
+				return &boxlayout.Box{
+					Window: window,
+					Size:   0,
 				}
 			}
 
@@ -469,33 +468,33 @@ func sidePanelChildren(args WindowArrangementArgs) func(width int, height int) [
 				accordionBox(&boxlayout.Box{Window: "commits", Weight: 1}),
 				accordionBox(getDefaultStashWindowBox(args)),
 			}
-		} else {
-			squashedHeight := 1
-			if height >= 21 {
-				squashedHeight = 3
-			}
+		}
 
-			squashedSidePanelBox := func(window string) *boxlayout.Box {
-				if window == args.CurrentSideWindow {
-					return &boxlayout.Box{
-						Window: window,
-						Weight: 1,
-					}
-				} else {
-					return &boxlayout.Box{
-						Window: window,
-						Size:   squashedHeight,
-					}
+		squashedHeight := 1
+		if height >= 21 {
+			squashedHeight = 3
+		}
+
+		squashedSidePanelBox := func(window string) *boxlayout.Box {
+			if window == args.CurrentSideWindow {
+				return &boxlayout.Box{
+					Window: window,
+					Weight: 1,
 				}
 			}
 
-			return []*boxlayout.Box{
-				squashedSidePanelBox("status"),
-				squashedSidePanelBox("files"),
-				squashedSidePanelBox("branches"),
-				squashedSidePanelBox("commits"),
-				squashedSidePanelBox("stash"),
+			return &boxlayout.Box{
+				Window: window,
+				Size:   squashedHeight,
 			}
 		}
+
+		return []*boxlayout.Box{
+			squashedSidePanelBox("status"),
+			squashedSidePanelBox("files"),
+			squashedSidePanelBox("branches"),
+			squashedSidePanelBox("commits"),
+			squashedSidePanelBox("stash"),
+		}
 	}
 }

pkg/gui/controllers/helpers/working_tree_helper.go

@@ -245,7 +245,7 @@ func (self *WorkingTreeHelper) commitPrefixConfigsForRepo() []config.CommitPrefi
 	cfg, ok := self.c.UserConfig().Git.CommitPrefixes[self.c.Git().RepoPaths.RepoName()]
 	if ok {
 		return append(cfg, self.c.UserConfig().Git.CommitPrefix...)
-	} else {
-		return self.c.UserConfig().Git.CommitPrefix
 	}
+
+	return self.c.UserConfig().Git.CommitPrefix
 }

pkg/gui/controllers/helpers/worktree_helper.go

@@ -132,24 +132,24 @@ func (self *WorktreeHelper) NewWorktreeCheckout(base string, canCheckoutBase boo
 					},
 				})
 
-				return nil
-			} else {
-				// prompt for the new branch name where a blank means we just check out the branch
-				self.c.Prompt(types.PromptOpts{
-					Title: self.c.Tr.NewBranchName,
-					HandleConfirm: func(branchName string) error {
-						if branchName == "" {
-							return errors.New(self.c.Tr.BranchNameCannotBeBlank)
-						}
-
-						opts.Branch = branchName
-
-						return f()
-					},
-				})
-
 				return nil
 			}
+
+			// prompt for the new branch name where a blank means we just check out the branch
+			self.c.Prompt(types.PromptOpts{
+				Title: self.c.Tr.NewBranchName,
+				HandleConfirm: func(branchName string) error {
+					if branchName == "" {
+						return errors.New(self.c.Tr.BranchNameCannotBeBlank)
+					}
+
+					opts.Branch = branchName
+
+					return f()
+				},
+			})
+
+			return nil
 		},
 	})
 

pkg/gui/controllers/sync_controller.go

@@ -92,27 +92,27 @@ func (self *SyncController) push(currentBranch *models.Branch) error {
 		opts := pushOpts{remoteBranchStoredLocally: currentBranch.RemoteBranchStoredLocally()}
 		if currentBranch.IsBehindForPush() {
 			return self.requestToForcePush(currentBranch, opts)
-		} else {
-			return self.pushAux(currentBranch, opts)
 		}
-	} else {
-		if self.c.Git().Config.GetPushToCurrent() {
-			return self.pushAux(currentBranch, pushOpts{setUpstream: true})
-		} else {
-			return self.c.Helpers().Upstream.PromptForUpstreamWithInitialContent(currentBranch, func(upstream string) error {
-				upstreamRemote, upstreamBranch, err := self.c.Helpers().Upstream.ParseUpstream(upstream)
-				if err != nil {
-					return err
-				}
 
-				return self.pushAux(currentBranch, pushOpts{
-					setUpstream:    true,
-					upstreamRemote: upstreamRemote,
-					upstreamBranch: upstreamBranch,
-				})
-			})
-		}
+		return self.pushAux(currentBranch, opts)
 	}
+
+	if self.c.Git().Config.GetPushToCurrent() {
+		return self.pushAux(currentBranch, pushOpts{setUpstream: true})
+	}
+
+	return self.c.Helpers().Upstream.PromptForUpstreamWithInitialContent(currentBranch, func(upstream string) error {
+		upstreamRemote, upstreamBranch, err := self.c.Helpers().Upstream.ParseUpstream(upstream)
+		if err != nil {
+			return err
+		}
+
+		return self.pushAux(currentBranch, pushOpts{
+			setUpstream:    true,
+			upstreamRemote: upstreamRemote,
+			upstreamBranch: upstreamBranch,
+		})
+	})
 }
 
 func (self *SyncController) pull(currentBranch *models.Branch) error {

pkg/gui/filetree/file_tree_view_model.go

@@ -138,9 +138,8 @@ func (self *FileTreeViewModel) findNewSelectedIdx(prevNodes []*FileNode, currNod
 		}
 		if node.File != nil && node.File.IsRename() {
 			return node.File.Names()
-		} else {
-			return []string{node.path}
 		}
+		return []string{node.path}
 	}
 
 	for _, prevNode := range prevNodes {

pkg/gui/gui.go

@@ -611,9 +611,9 @@ func initialScreenMode(startArgs appTypes.StartArgs, config config.AppConfigurer
 		return parseScreenModeArg(startArgs.ScreenMode)
 	} else if startArgs.FilterPath != "" || startArgs.GitArg != appTypes.GitArgNone {
 		return types.SCREEN_HALF
-	} else {
-		return parseScreenModeArg(config.GetUserConfig().Gui.ScreenMode)
 	}
+
+	return parseScreenModeArg(config.GetUserConfig().Gui.ScreenMode)
 }
 
 func parseScreenModeArg(screenModeArg string) types.ScreenMode {

pkg/gui/information_panel.go

@@ -17,9 +17,9 @@ func (gui *Gui) informationStr() string {
 		donate := style.FgMagenta.Sprint(style.PrintHyperlink(gui.c.Tr.Donate, constants.Links.Donate))
 		askQuestion := style.FgYellow.Sprint(style.PrintHyperlink(gui.c.Tr.AskQuestion, constants.Links.Discussions))
 		return fmt.Sprintf("%s %s %s", donate, askQuestion, gui.Config.GetVersion())
-	} else {
-		return gui.Config.GetVersion()
 	}
+
+	return gui.Config.GetVersion()
 }
 
 func (gui *Gui) handleInfoClick() error {

pkg/gui/keybindings/keybindings.go

@@ -41,9 +41,8 @@ func GetKey(key string) types.Key {
 		binding, ok := config.KeyByLabel[strings.ToLower(key)]
 		if !ok {
 			log.Fatalf("Unrecognized key %s for keybinding. For permitted values see %s", strings.ToLower(key), constants.Links.Docs.CustomKeybindings)
-		} else {
-			return binding
 		}
+		return binding
 	} else if runeCount == 1 {
 		return []rune(key)[0]
 	}

pkg/gui/mergeconflicts/merge_conflict.go

@@ -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}
 }

pkg/gui/patch_exploring/focus.go

@@ -25,9 +25,8 @@ func calculateNewOriginWithNeededAndWantedIdx(currentOrigin int, bufferHeight in
 		requiredChange := wantToSeeIdx - bottom
 		allowedChange := needToSeeIdx - origin
 		return origin + min(requiredChange, allowedChange)
-	} else {
-		return origin
 	}
+	return origin
 }
 
 func getNeedAndWantLineIdx(firstLineIdx int, lastLineIdx int, selectedLineIdx int, mode selectMode) (int, int) {
@@ -37,9 +36,8 @@ func getNeedAndWantLineIdx(firstLineIdx int, lastLineIdx int, selectedLineIdx in
 	case RANGE:
 		if selectedLineIdx == firstLineIdx {
 			return firstLineIdx, lastLineIdx
-		} else {
-			return lastLineIdx, firstLineIdx
 		}
+		return lastLineIdx, firstLineIdx
 	case HUNK:
 		return firstLineIdx, lastLineIdx
 	default:

pkg/gui/patch_exploring/state.go

@@ -267,9 +267,8 @@ func (s *State) SelectedViewRange() (int, int) {
 	case RANGE:
 		if s.rangeStartLineIdx > s.selectedLineIdx {
 			return s.selectedLineIdx, s.rangeStartLineIdx
-		} else {
-			return s.rangeStartLineIdx, s.selectedLineIdx
 		}
+		return s.rangeStartLineIdx, s.selectedLineIdx
 	case LINE:
 		return s.selectedLineIdx, s.selectedLineIdx
 	default:

pkg/gui/presentation/commits.go

@@ -145,9 +145,8 @@ func GetCommitListDisplayStrings(
 			getGraphLine = func(idx int) string {
 				if idx >= graphOffset {
 					return graphLines[idx-graphOffset]
-				} else {
-					return ""
 				}
+				return ""
 			}
 		}
 	} else {
@@ -305,9 +304,8 @@ func getBisectStatus(index int, commitHash string, bisectInfo *git_commands.Bise
 	} else {
 		if bisectBounds != nil && index >= bisectBounds.newIndex && index <= bisectBounds.oldIndex {
 			return BisectStatusCandidate
-		} else {
-			return BisectStatusNone
 		}
+		return BisectStatusNone
 	}
 
 	// should never land here

pkg/gui/presentation/files.go

@@ -63,9 +63,8 @@ func commitFilePatchStatus(node *filetree.Node[models.CommitFile], tree *filetre
 		return patchBuilder.GetFileStatus(file.Path, tree.GetRef().RefName()) == patch.UNSELECTED
 	}) {
 		return patch.UNSELECTED
-	} else {
-		return patch.PART
 	}
+	return patch.PART
 }
 
 func renderAux[T any](

pkg/gui/presentation/graph/cell.go

@@ -177,7 +177,7 @@ func getBoxDrawingChars(up, down, left, right bool) (string, string) {
 		return "╶", "─"
 	} else if !up && !down && !left && !right {
 		return " ", " "
-	} else {
-		panic("should not be possible")
 	}
+
+	panic("should not be possible")
 }

pkg/gui/presentation/graph/graph.go

@@ -246,9 +246,8 @@ func getNextPipes(prevPipes []Pipe, commit *models.Commit, getStyle func(c *mode
 			for i := pipe.toPos; i > pos; i-- {
 				if takenSpots.Includes(int(i)) || traversedSpots.Includes(int(i)) {
 					break
-				} else {
-					last = i
 				}
+				last = i
 			}
 			newPipes = append(newPipes, Pipe{
 				fromPos:  pipe.toPos,

pkg/tasks/tasks.go

@@ -260,7 +260,7 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p
 							callThen()
 							break outer
 						case line, ok = <-lineChan:
-							break
+							// process line below
 						}
 
 						loadingMutex.Lock()

pkg/tasks/tasks_test.go

@@ -167,7 +167,7 @@ func (d *BlankLineReader) Read(p []byte) (n int, err error) {
 		return 0, io.EOF
 	}
 
-	d.linesYielded += 1
+	d.linesYielded++
 	p[0] = '\n'
 	return 1, nil
 }

pkg/utils/formatting.go

@@ -44,9 +44,8 @@ func WithPadding(str string, padding int, alignment Alignment) string {
 	space := strings.Repeat(" ", padding-width)
 	if alignment == AlignLeft {
 		return str + space
-	} else {
-		return space + str
 	}
+	return space + str
 }
 
 // defaults to left-aligning each column. If you want to set the alignment of
@@ -187,9 +186,8 @@ func TruncateWithEllipsis(str string, limit int) string {
 func SafeTruncate(str string, limit int) string {
 	if len(str) > limit {
 		return str[0:limit]
-	} else {
-		return str
 	}
+	return str
 }
 
 const COMMIT_HASH_SHORT_SIZE = 8

pkg/utils/once_writer_test.go

@@ -9,7 +9,7 @@ func TestOnceWriter(t *testing.T) {
 	innerWriter := bytes.NewBuffer(nil)
 	counter := 0
 	onceWriter := NewOnceWriter(innerWriter, func() {
-		counter += 1
+		counter++
 	})
 	_, _ = onceWriter.Write([]byte("hello"))
 	_, _ = onceWriter.Write([]byte("hello"))

pkg/utils/utils.go

@@ -45,9 +45,8 @@ func ModuloWithWrap(n, max int) int {
 		return n % max
 	} else if n < 0 {
 		return max + n
-	} else {
-		return n
 	}
+	return n
 }
 
 func FindStringSubmatch(str string, regexpStr string) (bool, []string) {

pkg/utils/yaml_utils/yaml_utils_test.go

@@ -224,12 +224,10 @@ func TestTransformNode(t *testing.T) {
 			} else if node.ShortTag() == "!!str" {
 				// We have already transformed it,
 				return nil
-			} else {
-				return fmt.Errorf("Node was of bad type")
 			}
-		} else {
-			return fmt.Errorf("Node was not a scalar")
+			return fmt.Errorf("Node was of bad type")
 		}
+		return fmt.Errorf("Node was not a scalar")
 	}
 
 	tests := []struct {