diff --git a/rule/use-any.go b/rule/use-any.go index 9c6d5ccf8..bdf3c936d 100644 --- a/rule/use-any.go +++ b/rule/use-any.go @@ -1,8 +1,9 @@ package rule import ( - "github.com/mgechev/revive/lint" "go/ast" + + "github.com/mgechev/revive/lint" ) // UseAnyRule lints given else constructs. @@ -13,7 +14,6 @@ func (*UseAnyRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { var failures []lint.Failure walker := lintUseAny{ - commentPositions: getCommentsPositions(file.AST.Comments), onFailure: func(failure lint.Failure) { failures = append(failures, failure) }, @@ -30,8 +30,7 @@ func (*UseAnyRule) Name() string { } type lintUseAny struct { - commentPositions []int - onFailure func(lint.Failure) + onFailure func(lint.Failure) } func (w lintUseAny) Visit(n ast.Node) ast.Visitor { @@ -41,13 +40,7 @@ func (w lintUseAny) Visit(n ast.Node) ast.Visitor { } if len(it.Methods.List) != 0 { - return w // it is not an empty interface - } - - for _, pos := range w.commentPositions { - if pos > int(it.Pos()) && pos < int(it.End()) { - return w // it is a comment inside the interface - } + return w // it is not and empty interface } w.onFailure(lint.Failure{ @@ -59,14 +52,3 @@ func (w lintUseAny) Visit(n ast.Node) ast.Visitor { return w } - -func getCommentsPositions(commentGroups []*ast.CommentGroup) []int { - result := []int{} - for _, commentGroup := range commentGroups { - for _, comment := range commentGroup.List { - result = append(result, int(comment.Pos())) - } - } - - return result -} diff --git a/testdata/use-any.go b/testdata/use-any.go index a624d5ed2..bc6e64759 100644 --- a/testdata/use-any.go +++ b/testdata/use-any.go @@ -17,10 +17,6 @@ func any2(a int) interface{} {} // MATCH /since GO 1.18 'interface{}' can be rep var ni interface{ Close() } -var ni interface { - // Close() -} - type nt interface{ Close() } type na = interface{ Close() }