Commit changes

authzed · Aug 29, 2024 · c23bbe1 · c23bbe1
1 parent f4deb83
commit c23bbe1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 48 deletions.
diff --git a/tools/analyzers/closeafterusagecheck/closeafterusagecheck.go b/tools/analyzers/closeafterusagecheck/closeafterusagecheck.go
@@ -6,19 +6,12 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/samber/lo"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/inspect"
 	"golang.org/x/tools/go/ast/inspector"
 )
 
-func sliceMap(s []string, f func(value string) string) []string {
-	mapped := make([]string, 0, len(s))
-	for _, value := range s {
-		mapped = append(mapped, f(value))
-	}
-	return mapped
-}
-
 type nodeAndStack struct {
 	node  ast.Node
 	stack []ast.Node
@@ -39,7 +32,7 @@ func Analyzer() *analysis.Analyzer {
 		Run: func(pass *analysis.Pass) (any, error) {
 			// Check for a skipped package.
 			if len(*skip) > 0 {
-				skipped := sliceMap(strings.Split(*skip, ","), strings.TrimSpace)
+				skipped := lo.Map(strings.Split(*skip, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 				for _, s := range skipped {
 					if strings.Contains(pass.Pkg.Path(), s) {
 						return nil, nil

diff --git a/tools/analyzers/exprstatementcheck/exprstatementcheck.go b/tools/analyzers/exprstatementcheck/exprstatementcheck.go
@@ -7,19 +7,12 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/samber/lo"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/inspect"
 	"golang.org/x/tools/go/ast/inspector"
 )
 
-func sliceMap(s []string, f func(value string) string) []string {
-	mapped := make([]string, 0, len(s))
-	for _, value := range s {
-		mapped = append(mapped, f(value))
-	}
-	return mapped
-}
-
 type disallowedExprStatementConfig struct {
 	fullTypePath       string
 	errorMessage       string
@@ -47,7 +40,7 @@ func Analyzer() *analysis.Analyzer {
 		Run: func(pass *analysis.Pass) (any, error) {
 			// Check for a skipped package.
 			if len(*skip) > 0 {
-				skipped := sliceMap(strings.Split(*skip, ","), strings.TrimSpace)
+				skipped := lo.Map(strings.Split(*skip, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 				for _, s := range skipped {
 					if strings.Contains(pass.Pkg.Path(), s) {
 						return nil, nil

diff --git a/tools/analyzers/lendowncastcheck/lendowncastcheck.go b/tools/analyzers/lendowncastcheck/lendowncastcheck.go
@@ -7,19 +7,12 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/samber/lo"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/inspect"
 	"golang.org/x/tools/go/ast/inspector"
 )
 
-func sliceMap(s []string, f func(value string) string) []string {
-	mapped := make([]string, 0, len(s))
-	for _, value := range s {
-		mapped = append(mapped, f(value))
-	}
-	return mapped
-}
-
 var disallowedDowncastTypes = map[string]bool{
 	"int8":    true,
 	"int16":   true,
@@ -44,7 +37,7 @@ func Analyzer() *analysis.Analyzer {
 		Run: func(pass *analysis.Pass) (any, error) {
 			// Check for a skipped package.
 			if len(*skipPkg) > 0 {
-				skipped := sliceMap(strings.Split(*skipPkg, ","), strings.TrimSpace)
+				skipped := lo.Map(strings.Split(*skipPkg, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 				for _, s := range skipped {
 					if strings.Contains(pass.Pkg.Path(), s) {
 						return nil, nil
@@ -55,7 +48,7 @@ func Analyzer() *analysis.Analyzer {
 			// Check for a skipped file.
 			skipFilePatterns := make([]string, 0)
 			if len(*skipFiles) > 0 {
-				skipFilePatterns = sliceMap(strings.Split(*skipFiles, ","), strings.TrimSpace)
+				skipFilePatterns = lo.Map(strings.Split(*skipPkg, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 			}
 			for _, pattern := range skipFilePatterns {
 				_, err := regexp.Compile(pattern)

diff --git a/tools/analyzers/nilvaluecheck/nilvaluecheck.go b/tools/analyzers/nilvaluecheck/nilvaluecheck.go
@@ -7,19 +7,12 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/samber/lo"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/inspect"
 	"golang.org/x/tools/go/ast/inspector"
 )
 
-func sliceMap(s []string, f func(value string) string) []string {
-	mapped := make([]string, 0, len(s))
-	for _, value := range s {
-		mapped = append(mapped, f(value))
-	}
-	return mapped
-}
-
 func Analyzer() *analysis.Analyzer {
 	flagSet := flag.NewFlagSet("nilvaluecheck", flag.ExitOnError)
 	disallowedPaths := flagSet.String("disallowed-nil-return-type-paths", "", "full paths of the types for whom nil returns are disallowed")
@@ -31,7 +24,7 @@ func Analyzer() *analysis.Analyzer {
 		Run: func(pass *analysis.Pass) (any, error) {
 			// Check for a skipped package.
 			if len(*skip) > 0 {
-				skipped := sliceMap(strings.Split(*skip, ","), strings.TrimSpace)
+				skipped := lo.Map(strings.Split(*skip, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 				for _, s := range skipped {
 					if strings.Contains(pass.Pkg.Path(), s) {
 						return nil, nil
@@ -46,7 +39,7 @@ func Analyzer() *analysis.Analyzer {
 				(*ast.DeclStmt)(nil),
 			}
 
-			typePaths := sliceMap(strings.Split(*disallowedPaths, ","), strings.TrimSpace)
+			typePaths := lo.Map(strings.Split(*disallowedPaths, ","), func(path string, _ int) string { return strings.TrimSpace(path) })
 			hasTypePath := func(path string) bool {
 				return slices.Contains(typePaths, path)
 			}

diff --git a/tools/analyzers/paniccheck/paniccheck.go b/tools/analyzers/paniccheck/paniccheck.go
@@ -7,19 +7,12 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/samber/lo"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/inspect"
 	"golang.org/x/tools/go/ast/inspector"
 )
 
-func sliceMap(s []string, f func(value string) string) []string {
-	mapped := make([]string, 0, len(s))
-	for _, value := range s {
-		mapped = append(mapped, f(value))
-	}
-	return mapped
-}
-
 func Analyzer() *analysis.Analyzer {
 	flagSet := flag.NewFlagSet("paniccheck", flag.ExitOnError)
 	skipPkg := flagSet.String("skip-pkg", "", "package(s) to skip for linting")
@@ -31,7 +24,7 @@ func Analyzer() *analysis.Analyzer {
 		Run: func(pass *analysis.Pass) (any, error) {
 			// Check for a skipped package.
 			if len(*skipPkg) > 0 {
-				skipped := sliceMap(strings.Split(*skipPkg, ","), strings.TrimSpace)
+				skipped := lo.Map(strings.Split(*skipPkg, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 				for _, s := range skipped {
 					if strings.Contains(pass.Pkg.Path(), s) {
 						return nil, nil
@@ -42,7 +35,7 @@ func Analyzer() *analysis.Analyzer {
 			// Check for a skipped file.
 			skipFilePatterns := make([]string, 0)
 			if len(*skipFiles) > 0 {
-				skipFilePatterns = sliceMap(strings.Split(*skipFiles, ","), strings.TrimSpace)
+				skipFilePatterns = lo.Map(strings.Split(*skipPkg, ","), func(skipped string, _ int) string { return strings.TrimSpace(skipped) })
 			}
 			for _, pattern := range skipFilePatterns {
 				_, err := regexp.Compile(pattern)