dev: refactor ifs with cmp.Or

alexandear · alexandear · commit c356175408de · 2024-12-06T13:29:58.000+02:00
diff --git a/cmd/golangci-lint/main.go b/cmd/golangci-lint/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"cmp"
 	"fmt"
 	"os"
 	"runtime/debug"
@@ -63,17 +64,9 @@ func createBuildInfo() commands.BuildInfo {
 		}
 	}
 
-	if revision == "" {
-		revision = "unknown"
-	}
-
-	if modified == "" {
-		modified = "?"
-	}
-
-	if info.Date == "" {
-		info.Date = "(unknown)"
-	}
+	revision = cmp.Or(revision, "unknown")
+	modified = cmp.Or(modified, "?")
+	info.Date = cmp.Or(info.Date, "(unknown)")
 
 	info.Commit = fmt.Sprintf("(%s, modified: %s, mod sum: %q)", revision, modified, buildInfo.Main.Sum)
 
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -85,12 +85,7 @@ func detectGoVersion() string {
 		return goVersion
 	}
 
-	v := os.Getenv("GOVERSION")
-	if v != "" {
-		return v
-	}
-
-	return "1.17"
+	return cmp.Or(os.Getenv("GOVERSION"), "1.17")
 }
 
 // detectGoVersionFromGoMod tries to get Go version from go.mod.
diff --git a/pkg/config/loader.go b/pkg/config/loader.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"cmp"
 	"errors"
 	"fmt"
 	"os"
@@ -284,17 +285,13 @@ func (l *Loader) appendStringSlice(name string, current *[]string) {
 }
 
 func (l *Loader) handleGoVersion() {
-	if l.cfg.Run.Go == "" {
-		l.cfg.Run.Go = detectGoVersion()
-	}
+	l.cfg.Run.Go = cmp.Or(l.cfg.Run.Go, detectGoVersion())
 
 	l.cfg.LintersSettings.Govet.Go = l.cfg.Run.Go
 
 	l.cfg.LintersSettings.ParallelTest.Go = l.cfg.Run.Go
 
-	if l.cfg.LintersSettings.Gofumpt.LangVersion == "" {
-		l.cfg.LintersSettings.Gofumpt.LangVersion = l.cfg.Run.Go
-	}
+	l.cfg.LintersSettings.Gofumpt.LangVersion = cmp.Or(l.cfg.LintersSettings.Gofumpt.LangVersion, l.cfg.Run.Go)
 
 	trimmedGoVersion := goutil.TrimGoVersion(l.cfg.Run.Go)
 
@@ -430,9 +427,7 @@ func (l *Loader) handleLinterOptionDeprecations() {
 	// Deprecated since v1.58.0
 	if l.cfg.LintersSettings.SlogLint.ContextOnly {
 		l.log.Warnf("The configuration option `linters.sloglint.context-only` is deprecated, please use `linters.sloglint.context`.")
-		if l.cfg.LintersSettings.SlogLint.Context == "" {
-			l.cfg.LintersSettings.SlogLint.Context = "all"
-		}
+		l.cfg.LintersSettings.SlogLint.Context = cmp.Or(l.cfg.LintersSettings.SlogLint.Context, "all")
 	}
 
 	// Deprecated since v1.51.0
diff --git a/pkg/fsutils/linecache.go b/pkg/fsutils/linecache.go
@@ -2,6 +2,7 @@ package fsutils
 
 import (
 	"bytes"
+	"cmp"
 	"fmt"
 	"sync"
 )
@@ -21,9 +22,7 @@ func NewLineCache(fc *FileCache) *LineCache {
 
 // GetLine returns the index1-th (1-based index) line from the file on filePath
 func (lc *LineCache) GetLine(filePath string, index1 int) (string, error) {
-	if index1 == 0 { // some linters, e.g. gosec can do it: it really means first line
-		index1 = 1
-	}
+	index1 = cmp.Or(index1, 1) // some linters, e.g. gosec can return 0: it really means first line
 
 	const index1To0Offset = -1
 	rawLine, err := lc.getRawLine(filePath, index1+index1To0Offset)
diff --git a/pkg/goanalysis/pkgerrors/errors.go b/pkg/goanalysis/pkgerrors/errors.go
@@ -1,6 +1,7 @@
 package pkgerrors
 
 import (
+	"cmp"
 	"errors"
 	"fmt"
 
@@ -27,9 +28,7 @@ func BuildIssuesFromIllTypedError(errs []error, lintCtx *linter.Context) ([]resu
 	for _, err := range errs {
 		var ill *IllTypedError
 		if !errors.As(err, &ill) {
-			if other == nil {
-				other = err
-			}
+			other = cmp.Or(other, err)
 			continue
 		}
 
diff --git a/pkg/goanalysis/pkgerrors/extract.go b/pkg/goanalysis/pkgerrors/extract.go
@@ -1,6 +1,7 @@
 package pkgerrors
 
 import (
+	"cmp"
 	"fmt"
 	"regexp"
 	"strings"
@@ -50,9 +51,7 @@ func extractErrors(pkg *packages.Package) []packages.Error {
 		// some errors like "code in directory  expects import" don't have Pos, set it here
 		for i := range uniqErrors {
 			err := &uniqErrors[i]
-			if err.Pos == "" {
-				err.Pos = fmt.Sprintf("%s:1", pkg.GoFiles[0])
-			}
+			err.Pos = cmp.Or(err.Pos, fmt.Sprintf("%s:1", pkg.GoFiles[0]))
 		}
 	}
 
diff --git a/pkg/goanalysis/pkgerrors/parse_test.go b/pkg/goanalysis/pkgerrors/parse_test.go
@@ -1,6 +1,7 @@
 package pkgerrors
 
 import (
+	"cmp"
 	"fmt"
 	"testing"
 
@@ -36,10 +37,7 @@ func Test_parseError(t *testing.T) {
 			pos += fmt.Sprintf(":%d", i.Pos.Column)
 		}
 		out := pos
-		expOut := c.out
-		if expOut == "" {
-			expOut = c.in
-		}
+		expOut := cmp.Or(c.out, c.in)
 		assert.Equal(t, expOut, out)
 
 		assert.Equal(t, "typecheck", i.FromLinter)
diff --git a/pkg/goanalysis/runners.go b/pkg/goanalysis/runners.go
@@ -1,6 +1,7 @@
 package goanalysis
 
 import (
+	"cmp"
 	"fmt"
 
 	"golang.org/x/tools/go/analysis"
@@ -59,9 +60,7 @@ func runAnalyzers(cfg runAnalyzersConfig, lintCtx *linter.Context) ([]result.Iss
 		reportedIssues := cfg.reportIssues(lintCtx)
 		for i := range reportedIssues {
 			issue := &reportedIssues[i].Issue
-			if issue.Pkg == nil {
-				issue.Pkg = passToPkg[reportedIssues[i].Pass]
-			}
+			issue.Pkg = cmp.Or(issue.Pkg, passToPkg[reportedIssues[i].Pass])
 			retIssues = append(retIssues, *issue)
 		}
 		retIssues = append(retIssues, buildIssues(diags, cfg.getLinterNameForDiagnostic)...)
diff --git a/pkg/golinters/errcheck/errcheck.go b/pkg/golinters/errcheck/errcheck.go
@@ -2,6 +2,7 @@ package errcheck
 
 import (
 	"bufio"
+	"cmp"
 	"fmt"
 	"os"
 	"os/user"
@@ -90,10 +91,7 @@ func runErrCheck(lintCtx *linter.Context, pass *analysis.Pass, checker *errcheck
 		text := "Error return value is not checked"
 
 		if err.FuncName != "" {
-			code := err.SelectorName
-			if err.SelectorName == "" {
-				code = err.FuncName
-			}
+			code := cmp.Or(err.SelectorName, err.FuncName)
 
 			text = fmt.Sprintf("Error return value of %s is not checked", internal.FormatCode(code, lintCtx.Cfg))
 		}
diff --git a/pkg/golinters/godot/godot.go b/pkg/golinters/godot/godot.go
@@ -1,6 +1,7 @@
 package godot
 
 import (
+	"cmp"
 	"sync"
 
 	"github.com/tetafro/godot"
@@ -34,9 +35,7 @@ func New(settings *config.GodotSettings) *goanalysis.Linter {
 		}
 	}
 
-	if dotSettings.Scope == "" {
-		dotSettings.Scope = godot.DeclScope
-	}
+	dotSettings.Scope = cmp.Or(dotSettings.Scope, godot.DeclScope)
 
 	analyzer := &analysis.Analyzer{
 		Name: linterName,
diff --git a/pkg/golinters/revive/revive.go b/pkg/golinters/revive/revive.go
@@ -2,6 +2,7 @@ package revive
 
 import (
 	"bytes"
+	"cmp"
 	"encoding/json"
 	"fmt"
 	"go/token"
@@ -379,12 +380,8 @@ const defaultConfidence = 0.8
 func normalizeConfig(cfg *lint.Config) {
 	// NOTE(ldez): this custom section for golangci-lint should be kept.
 	// ---
-	if cfg.Confidence == 0 {
-		cfg.Confidence = defaultConfidence
-	}
-	if cfg.Severity == "" {
-		cfg.Severity = lint.SeverityWarning
-	}
+	cfg.Confidence = cmp.Or(cfg.Confidence, defaultConfidence)
+	cfg.Severity = cmp.Or(cfg.Severity, lint.SeverityWarning)
 	// ---
 
 	if len(cfg.Rules) == 0 {
diff --git a/pkg/goutil/env.go b/pkg/goutil/env.go
@@ -1,6 +1,7 @@
 package goutil
 
 import (
+	"cmp"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -54,10 +55,5 @@ func (e Env) Discover(ctx context.Context) error {
 }
 
 func (e Env) Get(k EnvKey) string {
-	envValue := os.Getenv(string(k))
-	if envValue != "" {
-		return envValue
-	}
-
-	return e.vars[string(k)]
+	return cmp.Or(os.Getenv(string(k)), e.vars[string(k)])
 }
diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go
@@ -1,6 +1,7 @@
 package lintersdb
 
 import (
+	"cmp"
 	"fmt"
 	"os"
 	"slices"
@@ -40,10 +41,7 @@ func NewManager(log logutils.Log, cfg *config.Config, builders ...Builder) (*Man
 		nameToLCs: make(map[string][]*linter.Config),
 	}
 
-	m.cfg = cfg
-	if cfg == nil {
-		m.cfg = config.NewDefault()
-	}
+	m.cfg = cmp.Or(cfg, config.NewDefault())
 
 	for _, builder := range builders {
 		linters, err := builder.Build(m.cfg)
diff --git a/pkg/lint/runner.go b/pkg/lint/runner.go
@@ -1,6 +1,7 @@
 package lint
 
 import (
+	"cmp"
 	"context"
 	"errors"
 	"fmt"
@@ -164,9 +165,7 @@ func (r *Runner) runLinterSafe(ctx context.Context, lintCtx *linter.Context,
 	}
 
 	for i := range issues {
-		if issues[i].FromLinter == "" {
-			issues[i].FromLinter = lc.Name()
-		}
+		issues[i].FromLinter = cmp.Or(issues[i].FromLinter, lc.Name())
 	}
 
 	return issues, nil
diff --git a/pkg/result/processors/nolint.go b/pkg/result/processors/nolint.go
@@ -1,6 +1,7 @@
 package processors
 
 import (
+	"cmp"
 	"go/ast"
 	"go/parser"
 	"go/token"
@@ -285,9 +286,7 @@ func (e *rangeExpander) Visit(node ast.Node) ast.Visitor {
 
 	expandedRange := *foundRange
 	// store the original unexpanded range for matching nolintlint issues
-	if expandedRange.originalRange == nil {
-		expandedRange.originalRange = foundRange
-	}
+	expandedRange.originalRange = cmp.Or(expandedRange.originalRange, foundRange)
 	if expandedRange.To < nodeEndLine {
 		expandedRange.To = nodeEndLine
 	}
diff --git a/pkg/result/processors/severity.go b/pkg/result/processors/severity.go
@@ -1,6 +1,7 @@
 package processors
 
 import (
+	"cmp"
 	"regexp"
 
 	"github.com/golangci/golangci-lint/pkg/config"
@@ -67,10 +68,7 @@ func (p *Severity) transform(issue *result.Issue) *result.Issue {
 				return issue
 			}
 
-			issue.Severity = rule.severity
-			if issue.Severity == "" {
-				issue.Severity = p.defaultSeverity
-			}
+			issue.Severity = cmp.Or(rule.severity, p.defaultSeverity)
 
 			return issue
 		}
diff --git a/test/bench/bench_test.go b/test/bench/bench_test.go
@@ -2,6 +2,7 @@ package bench
 
 import (
 	"bytes"
+	"cmp"
 	"errors"
 	"fmt"
 	"go/build"
@@ -133,10 +134,7 @@ func Benchmark_golangciLint(b *testing.B) {
 func getAllRepositories(tb testing.TB) []repo {
 	tb.Helper()
 
-	benchRoot := os.Getenv("GCL_BENCH_ROOT")
-	if benchRoot == "" {
-		benchRoot = tb.TempDir()
-	}
+	benchRoot := cmp.Or(os.Getenv("GCL_BENCH_ROOT"), tb.TempDir())
 
 	return []repo{
 		{

Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,7 @@ func detectGoVersion() string {`
`85`	`85`	`return goVersion`
`86`	`86`	`}`
`87`	`87`
`88`		`- v := os.Getenv("GOVERSION")`
`89`		`- if v != "" {`
`90`		`- return v`
`91`		`- }`
`92`		`-`
`93`		`- return "1.17"`
	`88`	`+ return cmp.Or(os.Getenv("GOVERSION"), "1.17")`
`94`	`89`	`}`
`95`	`90`
`96`	`91`	`// detectGoVersionFromGoMod tries to get Go version from go.mod.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package godot`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "cmp"`
`4`	`5`	`"sync"`
`5`	`6`
`6`	`7`	`"github.com/tetafro/godot"`
`@@ -34,9 +35,7 @@ func New(settings config.GodotSettings) goanalysis.Linter {`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`
`37`		`- if dotSettings.Scope == "" {`
`38`		`- dotSettings.Scope = godot.DeclScope`
`39`		`- }`
	`38`	`+ dotSettings.Scope = cmp.Or(dotSettings.Scope, godot.DeclScope)`
`40`	`39`
`41`	`40`	`analyzer := &analysis.Analyzer{`
`42`	`41`	`Name: linterName,`