protogen: fix oneof name mangling regression
The generator currently uses an unintuitive and stateful algorithm
for name generation where it "fixes" name conflicts by appending "_"
to the end of the new name.
PR#657 refactored the generator code and noticed that the above
algorithm was not properly taking into account that a Get method is
generated for parent oneofs, fixing it in the same PR. While this is
more correct, this breaks users (see #780) since it means that the
generation of names can change.
This PR changes the name mangling logic to be as it was previously.
This does mean that some new proto files may be unbuildable,
but that is arguably better than breaking existing proto files
Change-Id: I2e354f4bb5d9c2b562fa2faa9149e949e2d86a0f
Reviewed-on: https://go-review.googlesource.com/c/156877
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/protogen/protogen.go b/protogen/protogen.go
index 76964eb..9c279b8 100644
--- a/protogen/protogen.go
+++ b/protogen/protogen.go
@@ -569,22 +569,22 @@
"ExtensionMap": true,
"Descriptor": true,
}
- makeNameUnique := func(name string) string {
- for usedNames[name] || usedNames["Get"+name] {
+ makeNameUnique := func(name string, hasGetter bool) string {
+ for usedNames[name] || (hasGetter && usedNames["Get"+name]) {
name += "_"
}
usedNames[name] = true
- usedNames["Get"+name] = true
+ usedNames["Get"+name] = hasGetter
return name
}
seenOneofs := make(map[int]bool)
for _, field := range message.Fields {
- field.GoName = makeNameUnique(field.GoName)
+ field.GoName = makeNameUnique(field.GoName, true)
if field.OneofType != nil {
if !seenOneofs[field.OneofType.Desc.Index()] {
// If this is a field in a oneof that we haven't seen before,
// make the name for that oneof unique as well.
- field.OneofType.GoName = makeNameUnique(field.OneofType.GoName)
+ field.OneofType.GoName = makeNameUnique(field.OneofType.GoName, false)
seenOneofs[field.OneofType.Desc.Index()] = true
}
}