mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2025-03-09 22:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

testing/prototest: fix suggestion for field name

Browse Source 
We should use TextName instead of Name,
since it is the name that actually appears in the .proto file.

Change-Id: Ie526b200d18b0994d93dbb347c266fa5c50cddfe
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/241658
Reviewed-by: Herbie Ong <herbie@google.com>
This commit is contained in:
Joe Tsai 2020-07-09 00:21:07 -07:00
parent e14d6b3cdc
commit aabe152426
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/protocmp/util.go
View File

@ -172,9 +172,9 @@ func mustFindFieldDescriptor(md protoreflect.MessageDescriptor, s protoreflect.N
}
var suggestion string
switch d.(type) {
switch d := d.(type) {
case protoreflect.FieldDescriptor:
suggestion = fmt.Sprintf("; consider specifying field %q instead", d.Name())
suggestion = fmt.Sprintf("; consider specifying field %q instead", d.TextName())
case protoreflect.OneofDescriptor:
suggestion = fmt.Sprintf("; consider specifying oneof %q with IgnoreOneofs instead", d.Name())
}
@ -188,11 +188,11 @@ func mustFindOneofDescriptor(md protoreflect.MessageDescriptor, s protoreflect.N
}
var suggestion string
switch d.(type) {
switch d := d.(type) {
case protoreflect.OneofDescriptor:
suggestion = fmt.Sprintf("; consider specifying oneof %q instead", d.Name())
case protoreflect.FieldDescriptor:
suggestion = fmt.Sprintf("; consider specifying field %q with IgnoreFields instead", d.Name())
suggestion = fmt.Sprintf("; consider specifying field %q with IgnoreFields instead", d.TextName())
}
panic(fmt.Sprintf("message %q has no oneof %q%s", md.FullName(), s, suggestion))
}
@ -208,7 +208,7 @@ func findDescriptor(md protoreflect.MessageDescriptor, s protoreflect.Name) prot
// Best-effort match.
//
// It's a common user mistake to use the CameCased field name as it appears
// It's a common user mistake to use the CamelCased field name as it appears
// in the generated Go struct. Instead of complaining that it doesn't exist,
// suggest the real protobuf name that the user may have desired.
normalize := func(s protoreflect.Name) string {