apply suggestion from #1741

golangci · Feb 17, 2021 · cec1e78 · cec1e78
1 parent 3a9d212
commit cec1e78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/pkg/golinters/gocognit.go b/pkg/golinters/gocognit.go
@@ -1,4 +1,3 @@
-// nolint:dupl
 package golinters
 
 import (

diff --git a/pkg/golinters/gocyclo.go b/pkg/golinters/gocyclo.go
@@ -1,9 +1,7 @@
-// nolint:dupl
 package golinters
 
 import (
 	"fmt"
-	"sort"
 	"sync"
 
 	"github.com/fzipp/gocyclo"
@@ -31,24 +29,18 @@ func NewGocyclo() *goanalysis.Linter {
 		nil,
 	).WithContextSetter(func(lintCtx *linter.Context) {
 		analyzer.Run = func(pass *analysis.Pass) (interface{}, error) {
-			var stats []gocyclo.Stat
+			var stats gocyclo.Stats
 			for _, f := range pass.Files {
 				stats = gocyclo.AnalyzeASTFile(f, pass.Fset, stats)
 			}
 			if len(stats) == 0 {
 				return nil, nil
 			}
 
-			sort.SliceStable(stats, func(i, j int) bool {
-				return stats[i].Complexity > stats[j].Complexity
-			})
+			stats = stats.SortAndFilter(-1, lintCtx.Settings().Gocyclo.MinComplexity)
 
 			res := make([]goanalysis.Issue, 0, len(stats))
 			for _, s := range stats {
-				if s.Complexity <= lintCtx.Settings().Gocyclo.MinComplexity {
-					break // Break as the stats is already sorted from greatest to least
-				}
-
 				res = append(res, goanalysis.NewIssue(&result.Issue{
 					Pos: s.Pos,
 					Text: fmt.Sprintf("cyclomatic complexity %d of func %s is high (> %d)",