@@ -21,32 +21,43 @@ import (
2121 "fmt"
2222 "go/ast"
2323 "go/format"
24- "go/token"
2524 "go/types"
2625
2726 "golang.org/x/tools/go/analysis"
2827)
2928
30- // visitCallBasic checks for errors.Is(x, y) and errors.As(x, y).
31- func (v Visitor ) visitCallBasic (x * ast.CallExpr ) bool {
32- if len (x .Args ) != 2 { //nolint:mnd
33- return true
34- }
29+ // visitCallValue checks for encoding/json#Decoder.Decode, json.Unmarshal, errors.Is and errors.As.
30+ func (v Visitor ) visitCallBasic (x * ast.CallExpr ) bool { //nolint:cyclop
3531 fun , ok := unwrap (x .Fun ).(* ast.SelectorExpr )
36- if ! ok || ! v . isErrors ( fun . X ) {
32+ if ! ok {
3733 return true
3834 }
3935
40- if fun .Sel .Name == "As" { // Do not report pointers in errors.As(..., ...).
41- return false
36+ funType := v .TypesInfo .Types [fun .X ]
37+ if funType .IsValue () && funType .Type .String () == "*encoding/json.Decoder" && fun .Sel .Name == "Decode" {
38+ return false // Do not report pointers in json.Decoder#Decode
4239 }
4340
44- if fun .Sel .Name != "Is" {
41+ switch path , ok2 := v .pathOf (fun .X ); {
42+ case ! ok2 :
43+ return true
44+
45+ case path == "encoding/json" && fun .Sel .Name == "Unmarshal" :
46+ return false // Do not report pointers in json.Unmarshal(..., ...).
47+
48+ case len (x .Args ) != 2 || path != "errors" && path != "golang.org/x/exp/errors" :
4549 return true
46- }
4750
48- // Delegate errors.Is(..., ...) to visitCmp for further analysis of the comparison.
49- return v .visitCmp (x , x .Args [0 ], x .Args [1 ])
51+ case fun .Sel .Name == "As" :
52+ return false // Do not report pointers in errors.As(..., ...)
53+
54+ case fun .Sel .Name == "Is" :
55+ // Delegate errors.Is(..., ...) to visitCmp for further analysis of the comparison.
56+ return v .visitCmp (x , x .Args [0 ], x .Args [1 ])
57+
58+ default :
59+ return true
60+ }
5061}
5162
5263// visitCall checks for type casts T(x), errors.Is(x, y), errors.As(x, y) and new(T).
@@ -67,20 +78,18 @@ func (v Visitor) visitCall(x *ast.CallExpr) bool {
6778}
6879
6980// isErrors checks whether the expression is a package specifier for errors or golang.org/x/exp/errors.
70- func (v Visitor ) isErrors (x ast.Expr ) bool {
81+ func (v Visitor ) pathOf (x ast.Expr ) ( string , bool ) {
7182 id , ok := x .(* ast.Ident )
7283 if ! ok {
73- return false
84+ return "" , false
7485 }
7586
7687 pkg , ok := v .TypesInfo .Uses [id ].(* types.PkgName )
7788 if ! ok {
78- return false
89+ return "" , false
7990 }
8091
81- path := pkg .Imported ().Path ()
82-
83- return path == "errors" || path == "golang.org/x/exp/errors"
92+ return pkg .Imported ().Path (), true
8493}
8594
8695// visitCast is called for type casts T(nil).
@@ -97,7 +106,7 @@ func (v Visitor) visitCast(t types.Type, x *ast.CallExpr) bool {
97106 message := fmt .Sprintf ("cast of nil to pointer to zero-size variable of type %q" , elem )
98107 var fixes []analysis.SuggestedFix
99108 if s , ok2 := unwrap (x .Fun ).(* ast.StarExpr ); ok2 {
100- fixes = makePure (x , s .X )
109+ fixes = v . makePure (x , s .X )
101110 }
102111
103112 v .report (x , message , fixes )
@@ -117,12 +126,12 @@ func (v Visitor) visitNew(x *ast.CallExpr) bool {
117126
118127 arg := x .Args [0 ] // new(arg).
119128 argType := v .TypesInfo .Types [arg ].Type
120- if ! v .isZeroSizedType (argType ) {
129+ if ! v .zeroSizedType (argType ) {
121130 return true
122131 }
123132
124133 message := fmt .Sprintf ("new called on zero-sized type %q" , argType )
125- fixes := makePure (x , arg )
134+ fixes := v . makePure (x , arg )
126135 v .report (x , message , fixes )
127136
128137 return false
@@ -143,9 +152,9 @@ func unwrap(e ast.Expr) ast.Expr {
143152}
144153
145154// makePure adds a suggested fix from (*T)(nil) or new(T) to T{}.
146- func makePure (n ast.Node , x ast.Expr ) []analysis.SuggestedFix {
155+ func ( v Visitor ) makePure (n ast.Node , x ast.Expr ) []analysis.SuggestedFix {
147156 var buf bytes.Buffer
148- if err := format .Node (& buf , token . NewFileSet () , x ); err != nil {
157+ if err := format .Node (& buf , v . Fset , x ); err != nil {
149158 return nil
150159 }
151160 buf .WriteString ("{}" )
0 commit comments