tree dab468da43666fcaefb8aed1590ff3e3fbac8cf2
parent 2e0c3da5a4042e746b988663a41eafe76a338985
author Damien Neil <dneil@google.com> 1537384337 -0700
committer Damien Neil <dneil@google.com> 1537391724 +0000

cmd/protoc-gen-go: additional conflict resolution for oneof field types

This is purely for consistent output with the previous protoc-gen-go.

Consider this message:

  message M {
    oneof union { string conflict = 1; }
    message Conflict {}
  }

The type for the wrapper of M.conflict will have the same name as the
embedded message type for M.Conflict.

The previous protoc-gen-go performs a disambiguation step where it adds
_s to the names of oneof field types until they have no conflicts with
nested messages or enums in the same message as the field.

There are a number of ways in which this can fail, of course. Preserve
the behavior for now.

Change-Id: I78a1c6588b577324e003b8bc337b75bb363432ba
Reviewed-on: https://go-review.googlesource.com/136357
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>