analysis/code: strip pointer when printing selector for field

dominikh · Nov 6, 2021 · 9a50128 · 9a50128
1 parent d42e6ab
commit 9a50128
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/analysis/code/code.go b/analysis/code/code.go
@@ -73,7 +73,11 @@ func SelectorName(pass *analysis.Pass, expr *ast.SelectorExpr) string {
 		}
 		panic(fmt.Sprintf("unsupported selector: %v", expr))
 	}
-	return fmt.Sprintf("(%s).%s", sel.Recv(), sel.Obj().Name())
+	if v, ok := sel.Obj().(*types.Var); ok && v.IsField() {
+		return fmt.Sprintf("(%s).%s", typeutil.DereferenceR(sel.Recv()), sel.Obj().Name())
+	} else {
+		return fmt.Sprintf("(%s).%s", sel.Recv(), sel.Obj().Name())
+	}
 }
 
 func IsNil(pass *analysis.Pass, expr ast.Expr) bool {

diff --git a/staticcheck/testdata/src/CheckDeprecated_go14/CheckDeprecated.go b/staticcheck/testdata/src/CheckDeprecated_go14/CheckDeprecated.go
@@ -12,7 +12,7 @@ var _ = syscall.StringByteSlice("") // want `Use ByteSliceFromString instead`
 
 func fn1(err error) {
 	var r *http.Request
-	_ = r.Cancel                    // want `If a Request's Cancel field and context are both`
+	_ = r.Cancel
 	_ = syscall.StringByteSlice("") // want `Use ByteSliceFromString instead`
 	_ = os.SEEK_SET
 	var _ flate.ReadError

diff --git a/staticcheck/testdata/src/CheckDeprecated_go18/CheckDeprecated.go b/staticcheck/testdata/src/CheckDeprecated_go18/CheckDeprecated.go
@@ -11,8 +11,10 @@ import (
 var _ = syscall.StringByteSlice("") // want `Use ByteSliceFromString instead`
 
 func fn1(err error) {
-	var r *http.Request
-	_ = r.Cancel                        // want `If a Request's Cancel field and context are both`
+	var r http.Request
+	var rp *http.Request
+	_ = r.Cancel                        // want `deprecated since Go 1\.7:.+If a Request's Cancel field and context are both`
+	_ = rp.Cancel                       // want `deprecated since Go 1\.7:.+If a Request's Cancel field and context are both`
 	_ = syscall.StringByteSlice("")     // want `Use ByteSliceFromString instead`
 	_ = os.SEEK_SET                     // want `Use io\.SeekStart, io\.SeekCurrent, and io\.SeekEnd`
 	if err == http.ErrWriteAfterFlush { // want `ErrWriteAfterFlush is no longer`