From 966259a646888582f7bb8467970966f1b4303e65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2024 13:57:36 +0100
Subject: [PATCH] build(deps): bump github.com/ultraware/funlen from 0.1.0 to
 0.2.0 (#5231)

Co-authored-by: Fernandez Ludovic <ldez@users.noreply.github.com>
---
 go.mod                         |  2 +-
 go.sum                         |  4 +-
 pkg/golinters/funlen/funlen.go | 74 ++++++++--------------------------
 3 files changed, 19 insertions(+), 61 deletions(-)

diff --git a/go.mod b/go.mod
index 2202970c9f2e..f159592e262c 100644
--- a/go.mod
+++ b/go.mod
@@ -113,7 +113,7 @@ require (
 	github.com/timonwong/loggercheck v0.10.1
 	github.com/tomarrell/wrapcheck/v2 v2.10.0
 	github.com/tommy-muehle/go-mnd/v2 v2.5.1
-	github.com/ultraware/funlen v0.1.0
+	github.com/ultraware/funlen v0.2.0
 	github.com/ultraware/whitespace v0.1.1
 	github.com/uudashr/gocognit v1.2.0
 	github.com/uudashr/iface v1.3.0
diff --git a/go.sum b/go.sum
index a80f534130fc..a195891fd2f8 100644
--- a/go.sum
+++ b/go.sum
@@ -563,8 +563,8 @@ github.com/tomarrell/wrapcheck/v2 v2.10.0 h1:SzRCryzy4IrAH7bVGG4cK40tNUhmVmMDuJu
 github.com/tomarrell/wrapcheck/v2 v2.10.0/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo=
 github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw=
 github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw=
-github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI=
-github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4=
+github.com/ultraware/funlen v0.2.0 h1:gCHmCn+d2/1SemTdYMiKLAHFYxTYz7z9VIDRaTGyLkI=
+github.com/ultraware/funlen v0.2.0/go.mod h1:ZE0q4TsJ8T1SQcjmkhN/w+MceuatI6pBFSxxyteHIJA=
 github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/Gk8VQ=
 github.com/ultraware/whitespace v0.1.1/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8=
 github.com/uudashr/gocognit v1.2.0 h1:3BU9aMr1xbhPlvJLSydKwdLN3tEUUrzPSSM8S4hDYRA=
diff --git a/pkg/golinters/funlen/funlen.go b/pkg/golinters/funlen/funlen.go
index e43339394d75..bdadcece4600 100644
--- a/pkg/golinters/funlen/funlen.go
+++ b/pkg/golinters/funlen/funlen.go
@@ -1,75 +1,33 @@
 package funlen
 
 import (
-	"go/token"
-	"strings"
-	"sync"
-
 	"github.com/ultraware/funlen"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/goanalysis"
-	"github.com/golangci/golangci-lint/pkg/lint/linter"
-	"github.com/golangci/golangci-lint/pkg/result"
 )
 
-const linterName = "funlen"
+type Config struct {
+	lineLimit      int
+	stmtLimit      int
+	ignoreComments bool
+}
 
 func New(settings *config.FunlenSettings) *goanalysis.Linter {
-	var mu sync.Mutex
-	var resIssues []goanalysis.Issue
-
-	analyzer := &analysis.Analyzer{
-		Name: linterName,
-		Doc:  goanalysis.TheOnlyanalyzerDoc,
-		Run: func(pass *analysis.Pass) (any, error) {
-			issues := runFunlen(pass, settings)
-
-			if len(issues) == 0 {
-				return nil, nil
-			}
-
-			mu.Lock()
-			resIssues = append(resIssues, issues...)
-			mu.Unlock()
-
-			return nil, nil
-		},
+	cfg := Config{}
+	if settings != nil {
+		cfg.lineLimit = settings.Lines
+		cfg.stmtLimit = settings.Statements
+		cfg.ignoreComments = !settings.IgnoreComments
 	}
 
+	a := funlen.NewAnalyzer(cfg.lineLimit, cfg.stmtLimit, cfg.ignoreComments)
+
 	return goanalysis.NewLinter(
-		linterName,
-		"Tool for detection of long functions",
-		[]*analysis.Analyzer{analyzer},
+		a.Name,
+		a.Doc,
+		[]*analysis.Analyzer{a},
 		nil,
-	).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue {
-		return resIssues
-	}).WithLoadMode(goanalysis.LoadModeSyntax)
-}
-
-func runFunlen(pass *analysis.Pass, settings *config.FunlenSettings) []goanalysis.Issue {
-	var lintIssues []funlen.Message
-	for _, file := range pass.Files {
-		fileIssues := funlen.Run(file, pass.Fset, settings.Lines, settings.Statements, settings.IgnoreComments)
-		lintIssues = append(lintIssues, fileIssues...)
-	}
-
-	if len(lintIssues) == 0 {
-		return nil
-	}
-
-	issues := make([]goanalysis.Issue, len(lintIssues))
-	for k, i := range lintIssues {
-		issues[k] = goanalysis.NewIssue(&result.Issue{
-			Pos: token.Position{
-				Filename: i.Pos.Filename,
-				Line:     i.Pos.Line,
-			},
-			Text:       strings.TrimRight(i.Message, "\n"),
-			FromLinter: linterName,
-		}, pass)
-	}
-
-	return issues
+	).WithLoadMode(goanalysis.LoadModeSyntax)
 }