Modernize all codes (#5036)

go run
golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest
-fix -test ./...

Author: stefanhaller

pkg/commands/git_commands/commit_loader.go

@@ -218,8 +218,8 @@ func (self *CommitLoader) extractCommitFromLine(hashPool *utils.StringPool, line
 	var tags []string
 
 	if extraInfo != "" {
-		extraInfoFields := strings.Split(extraInfo, ",")
-		for _, extraInfoField := range extraInfoFields {
+		extraInfoFields := strings.SplitSeq(extraInfo, ",")
+		for extraInfoField := range extraInfoFields {
 			extraInfoField = strings.TrimSpace(extraInfoField)
 			re := regexp.MustCompile(`tag: (.+)`)
 			tagMatch := re.FindStringSubmatch(extraInfoField)

pkg/commands/git_commands/flow.go

@@ -32,7 +32,7 @@ func (self *FlowCommands) FinishCmdObj(branchName string) (*oscommands.CmdObj, e
 	suffix := strings.Replace(branchName, prefix, "", 1)
 
 	branchType := ""
-	for _, line := range strings.Split(strings.TrimSpace(prefixes), "\n") {
+	for line := range strings.SplitSeq(strings.TrimSpace(prefixes), "\n") {
 		if strings.HasPrefix(line, "gitflow.prefix.") && strings.HasSuffix(line, prefix) {
 
 			regex := regexp.MustCompile("gitflow.prefix.([^ ]*) .*")

pkg/fakes/log.go

@@ -16,7 +16,7 @@ type FakeFieldLogger struct {
 	*logrus.Entry
 }
 
-func (self *FakeFieldLogger) Error(args ...interface{}) {
+func (self *FakeFieldLogger) Error(args ...any) {
 	if len(args) != 1 {
 		panic("Expected exactly one argument to FakeFieldLogger.Error")
 	}
@@ -29,7 +29,7 @@ func (self *FakeFieldLogger) Error(args ...interface{}) {
 	}
 }
 
-func (self *FakeFieldLogger) Errorf(format string, args ...interface{}) {
+func (self *FakeFieldLogger) Errorf(format string, args ...any) {
 	msg := fmt.Sprintf(format, args...)
 	self.loggedErrors = append(self.loggedErrors, msg)
 }

pkg/gui/controllers/helpers/confirmation_helper.go

@@ -109,11 +109,7 @@ func (self *ConfirmationHelper) getPopupPanelWidth() int {
 	panelWidth := 4 * width / 7
 	minWidth := 80
 	if panelWidth < minWidth {
-		if width-2 < minWidth {
-			panelWidth = width - 2
-		} else {
-			panelWidth = minWidth
-		}
+		panelWidth = min(width-2, minWidth)
 	}
 
 	return panelWidth

pkg/gui/controllers/helpers/fixup_helper.go

@@ -225,8 +225,8 @@ func (self *FixupHelper) blameDeletedLines(deletedLineHunks []*hunk) ([]string,
 			if err != nil {
 				return err
 			}
-			blameLines := strings.Split(strings.TrimSuffix(blameOutput, "\n"), "\n")
-			for _, line := range blameLines {
+			blameLines := strings.SplitSeq(strings.TrimSuffix(blameOutput, "\n"), "\n")
+			for line := range blameLines {
 				hashChan <- strings.Split(line, " ")[0]
 			}
 			return nil

pkg/gui/controllers/helpers/repos_helper.go

@@ -59,9 +59,9 @@ func (self *ReposHelper) getCurrentBranch(path string) string {
 			content := strings.TrimSpace(string(headFile))
 			refsPrefix := "ref: refs/heads/"
 			var branchDisplay string
-			if strings.HasPrefix(content, refsPrefix) {
+			if bareName, ok := strings.CutPrefix(content, refsPrefix); ok {
 				// is a branch
-				branchDisplay = strings.TrimPrefix(content, refsPrefix)
+				branchDisplay = bareName
 			} else {
 				// detached HEAD state, displaying short hash
 				branchDisplay = utils.ShortHash(content)

pkg/gui/controllers/helpers/window_arrangement_helper.go

@@ -2,6 +2,7 @@ package helpers
 
 import (
 	"fmt"
+	mapsPkg "maps"
 	"math"
 	"strings"
 
@@ -194,9 +195,7 @@ func mainPanelChildren(args WindowArrangementArgs) []*boxlayout.Box {
 func MergeMaps[K comparable, V any](maps ...map[K]V) map[K]V {
 	result := map[K]V{}
 	for _, currMap := range maps {
-		for key, value := range currMap {
-			result[key] = value
-		}
+		mapsPkg.Copy(result, currMap)
 	}
 
 	return result

pkg/gui/controllers/local_commits_controller.go

@@ -1116,8 +1116,8 @@ func isFixupCommit(subject string) (string, bool) {
 	prefixes := []string{"fixup! ", "squash! ", "amend! "}
 	trimPrefix := func(s string) (string, bool) {
 		for _, prefix := range prefixes {
-			if strings.HasPrefix(s, prefix) {
-				return strings.TrimPrefix(s, prefix), true
+			if trimmedSubject, ok := strings.CutPrefix(s, prefix); ok {
+				return trimmedSubject, true
 			}
 		}
 		return s, false

pkg/gui/presentation/graph/graph_test.go

@@ -227,7 +227,7 @@ func TestRenderCommitGraph(t *testing.T) {
 			lines := RenderCommitGraph(commits, hashPool.Add("blah"), getStyle)
 
 			trimmedExpectedOutput := ""
-			for _, line := range strings.Split(strings.TrimPrefix(test.expectedOutput, "\n"), "\n") {
+			for line := range strings.SplitSeq(strings.TrimPrefix(test.expectedOutput, "\n"), "\n") {
 				trimmedExpectedOutput += strings.TrimSpace(line) + "\n"
 			}
 

pkg/gui/services/custom_commands/menu_generator.go

@@ -34,7 +34,7 @@ func (self *MenuGenerator) call(commandOutput, filter, valueFormat, labelFormat
 	}
 
 	menuItems := []*commandMenuItem{}
-	for _, line := range strings.Split(commandOutput, "\n") {
+	for line := range strings.SplitSeq(commandOutput, "\n") {
 		if line == "" {
 			continue
 		}