Skip to content

Use upstream gocyclo. #1739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 17, 2021
Merged

Use upstream gocyclo. #1739

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a9d212
feat: use upstream gocyclo.
ldez Feb 16, 2021
cec1e78
apply suggestion from #1741
ldez Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
apply suggestion from #1741
  • Loading branch information
@ldez
ldez committed Feb 17, 2021
commit cec1e780c4085d223dcc7c18b52f4f7cb4939ceb
1 change: 0 additions & 1 deletion pkg/golinters/gocognit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// nolint:dupl
package golinters

import (
Expand Down
12 changes: 2 additions & 10 deletions pkg/golinters/gocyclo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// nolint:dupl
package golinters

import (
"fmt"
"sort"
"sync"

"github.com/fzipp/gocyclo"
Expand Down Expand Up @@ -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)",
Expand Down