Merge pull request #891 from uudashr/master

Update the gocognit linter due to bug fix
This commit is contained in:
Aleksandr Razumov 2019-12-19 15:15:55 +03:00 committed by GitHub
commit cf1fbc590a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 11 deletions

2
go.mod
View File

@ -40,7 +40,7 @@ require (
github.com/tommy-muehle/go-mnd v1.1.1
github.com/ultraware/funlen v0.0.2
github.com/ultraware/whitespace v0.0.4
github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517
github.com/uudashr/gocognit v1.0.1
github.com/valyala/quicktemplate v1.2.0
golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a
gopkg.in/yaml.v2 v2.2.5

4
go.sum
View File

@ -240,8 +240,8 @@ github.com/ultraware/funlen v0.0.2 h1:Av96YVBwwNSe4MLR7iI/BIa3VyI7/djnto/pK3Uxbd
github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg=
github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517 h1:ChMKTho2hWKpks/nD/FL2KqM1wuVt62oJeiE8+eFpGs=
github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM=
github.com/uudashr/gocognit v1.0.1 h1:MoG2fZ0b/Eo7NXoIwCVFLG5JED3qgQz5/NEE+rOsjPs=
github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=

0
vendor/github.com/uudashr/gocognit/go.sum generated vendored Normal file
View File

View File

@ -133,6 +133,8 @@ func (v *complexityVisitor) Visit(n ast.Node) ast.Visitor {
return v.visitSelectStmt(n)
case *ast.ForStmt:
return v.visitForStmt(n)
case *ast.RangeStmt:
return v.visitRangeStmt(n)
case *ast.FuncLit:
return v.visitFuncLit(n)
case *ast.BranchStmt:
@ -218,6 +220,25 @@ func (v *complexityVisitor) visitForStmt(n *ast.ForStmt) ast.Visitor {
return nil
}
func (v *complexityVisitor) visitRangeStmt(n *ast.RangeStmt) ast.Visitor {
v.nestIncComplexity()
if n.Key != nil {
ast.Walk(v, n.Key)
}
if n.Value != nil {
ast.Walk(v, n.Value)
}
ast.Walk(v, n.X)
v.incNesting()
ast.Walk(v, n.Body)
v.decNesting()
return nil
}
func (v *complexityVisitor) visitFuncLit(n *ast.FuncLit) ast.Visitor {
ast.Walk(v, n.Type)
@ -290,9 +311,3 @@ func mergeBinaryOps(x []token.Token, op token.Token, y []token.Token) []token.To
}
return out
}
func walkExprList(v ast.Visitor, list []ast.Expr) {
for _, x := range list {
ast.Walk(v, x)
}
}

4
vendor/modules.txt vendored
View File

@ -170,14 +170,14 @@ github.com/stretchr/testify/mock
github.com/stretchr/testify/require
# github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e
github.com/timakin/bodyclose/passes/bodyclose
# github.com/tommy-muehle/go-mnd v0.0.0-20190903201840-c93e405da530
# github.com/tommy-muehle/go-mnd v1.1.1
github.com/tommy-muehle/go-mnd
github.com/tommy-muehle/go-mnd/checks
# github.com/ultraware/funlen v0.0.2
github.com/ultraware/funlen
# github.com/ultraware/whitespace v0.0.4
github.com/ultraware/whitespace
# github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517
# github.com/uudashr/gocognit v1.0.1
github.com/uudashr/gocognit
# github.com/valyala/bytebufferpool v1.0.0
github.com/valyala/bytebufferpool