cmd/vet: rewrite structtag using go/types

This lets us simplify the code considerably. For example, unquoting the
tag is no longer necessary, and we can get the field name with a single
method call.

While at it, fix a typechecking error in testdata/structtag.go, which
hadn't been caught since vet still skips past go/types errors in most
cases.

Using go/types will also let us expand the structtag check more easily
if we want to, for example to allow it to check for duplicates in
embedded fields.

Finally, update one of the test cases to check for regressions when we
output invalid tag strings. We also checked that these two changes to
testdata/structtag.go didn't fail with the old structtag check.

For #25593.

Change-Id: Iea4906d0f30a67f36b28c21d8aa96251aae653f5
Reviewed-on: https://go-review.googlesource.com/115676
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Alan Donovan <adonovan@google.com>
Reviewed-by: Rob Pike <r@golang.org>

diff --git a/src/cmd/vet/structtag.go b/src/cmd/vet/structtag.go
index 3bc30c47405d8f6707adb653617abcba80210317..a2571419c75ad2411889ae1ddfb9fb899e8a08c5 100644 (file)
--- a/src/cmd/vet/structtag.go
+++ b/src/cmd/vet/structtag.go
@@ -10,6 +10,7 @@ import (
        "errors"
        "go/ast"
        "go/token"
+       "go/types"
        "reflect"
        "strconv"
        "strings"
@@ -24,9 +25,12 @@ func init() {
 
 // checkStructFieldTags checks all the field tags of a struct, including checking for duplicates.
 func checkStructFieldTags(f *File, node ast.Node) {
+       styp := f.pkg.types[node.(*ast.StructType)].Type.(*types.Struct)
        var seen map[[2]string]token.Pos
-       for _, field := range node.(*ast.StructType).Fields.List {
-               checkCanonicalFieldTag(f, field, &seen)
+       for i := 0; i < styp.NumFields(); i++ {
+               field := styp.Field(i)
+               tag := styp.Tag(i)
+               checkCanonicalFieldTag(f, field, tag, &seen)
        }
 }
 
@@ -34,20 +38,13 @@ var checkTagDups = []string{"json", "xml"}
 var checkTagSpaces = map[string]bool{"json": true, "xml": true, "asn1": true}
 
 // checkCanonicalFieldTag checks a single struct field tag.
-func checkCanonicalFieldTag(f *File, field *ast.Field, seen *map[[2]string]token.Pos) {
-       if field.Tag == nil {
-               return
-       }
-
-       tag, err := strconv.Unquote(field.Tag.Value)
-       if err != nil {
-               f.Badf(field.Pos(), "unable to read struct tag %s", field.Tag.Value)
+func checkCanonicalFieldTag(f *File, field *types.Var, tag string, seen *map[[2]string]token.Pos) {
+       if tag == "" {
                return
        }
 
        if err := validateStructTag(tag); err != nil {
-               raw, _ := strconv.Unquote(field.Tag.Value) // field.Tag.Value is known to be a quoted string
-               f.Badf(field.Pos(), "struct field tag %#q not compatible with reflect.StructTag.Get: %s", raw, err)
+               f.Badf(field.Pos(), "struct field tag %#q not compatible with reflect.StructTag.Get: %s", tag, err)
        }
 
        for _, key := range checkTagDups {
@@ -55,7 +52,7 @@ func checkCanonicalFieldTag(f *File, field *ast.Field, seen *map[[2]string]token
                if val == "" || val == "-" || val[0] == ',' {
                        continue
                }
-               if key == "xml" && len(field.Names) > 0 && field.Names[0].Name == "XMLName" {
+               if key == "xml" && field.Name() == "XMLName" {
                        // XMLName defines the XML element name of the struct being
                        // checked. That name cannot collide with element or attribute
                        // names defined on other fields of the struct. Vet does not have a
@@ -79,13 +76,7 @@ func checkCanonicalFieldTag(f *File, field *ast.Field, seen *map[[2]string]token
                        *seen = map[[2]string]token.Pos{}
                }
                if pos, ok := (*seen)[[2]string{key, val}]; ok {
-                       var name string
-                       if len(field.Names) > 0 {
-                               name = field.Names[0].Name
-                       } else {
-                               name = field.Type.(*ast.Ident).Name
-                       }
-                       f.Badf(field.Pos(), "struct field %s repeats %s tag %q also at %s", name, key, val, f.loc(pos))
+                       f.Badf(field.Pos(), "struct field %s repeats %s tag %q also at %s", field.Name(), key, val, f.loc(pos))
                } else {
                        (*seen)[[2]string{key, val}] = field.Pos()
                }
@@ -95,17 +86,17 @@ func checkCanonicalFieldTag(f *File, field *ast.Field, seen *map[[2]string]token
 
        // Embedded struct. Nothing to do for now, but that
        // may change, depending on what happens with issue 7363.
-       if len(field.Names) == 0 {
+       if field.Anonymous() {
                return
        }
 
-       if field.Names[0].IsExported() {
+       if field.Exported() {
                return
        }
 
        for _, enc := range [...]string{"json", "xml"} {
                if reflect.StructTag(tag).Get(enc) != "" {
-                       f.Badf(field.Pos(), "struct field %s has %s tag but is not exported", field.Names[0].Name, enc)
+                       f.Badf(field.Pos(), "struct field %s has %s tag but is not exported", field.Name(), enc)
                        return
                }
        }

diff --git a/src/cmd/vet/testdata/structtag.go b/src/cmd/vet/testdata/structtag.go
index ce21e803c802e3ceae415ddd4365062544326432..34bf9f6599b411fd598ce3c5553b6643f69b1631 100644 (file)
--- a/src/cmd/vet/testdata/structtag.go
+++ b/src/cmd/vet/testdata/structtag.go
@@ -9,7 +9,7 @@ package testdata
 import "encoding/xml"
 
 type StructTagTest struct {
-       A   int "hello"            // ERROR "not compatible with reflect.StructTag.Get: bad syntax for struct tag pair"
+       A   int "hello"            // ERROR "`hello` not compatible with reflect.StructTag.Get: bad syntax for struct tag pair"
        B   int "\tx:\"y\""        // ERROR "not compatible with reflect.StructTag.Get: bad syntax for struct tag key"
        C   int "x:\"y\"\tx:\"y\"" // ERROR "not compatible with reflect.StructTag.Get"
        D   int "x:`y`"            // ERROR "not compatible with reflect.StructTag.Get: bad syntax for struct tag value"
@@ -66,7 +66,7 @@ type DuplicateJSONFields struct {
        DuplicateOmitXML int `xml:"a,omitempty"` // ERROR "struct field DuplicateOmitXML repeats xml tag .a. also at structtag.go:60"
        NonXML           int `foo:"a"`
        DuplicateNonXML  int `foo:"a"`
-       Embedded         struct {
+       Embedded2        struct {
                DuplicateXML int `xml:"a"` // OK because its not in the same struct type
        }
        AnonymousXML `xml:"a"` // ERROR "struct field AnonymousXML repeats xml tag .a. also at structtag.go:60"