Potential fix for #585

Signed-off-by: Eduardo Solis <eduardo.solis@mica.io>
bufbuild · Aug 29, 2022 · eb08501 · eb08501
1 parent 61feee2
commit eb08501
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/templates/go/file.go b/templates/go/file.go
@@ -20,8 +20,8 @@ import (
 
 	"google.golang.org/protobuf/types/known/anypb"
 
-	{{ range $pkg, $path := enumPackages (externalEnums .) }}
-		{{ $pkg }} "{{ $path }}"
+	{{ range $pkg, $enum := enumPackages (externalEnums .) }}
+		{{ $pkg }} "{{ $enum.FilePath }}"
 	{{ end }}
 )
 
@@ -40,8 +40,8 @@ var (
 	_ = anypb.Any{}
 	_ = sort.Sort
 
-	{{ range $pkg, $path := enumPackages (externalEnums .) }}
-	_ = {{ $pkg }}.{{ enumName (index (externalEnums $) 0) }}(0)
+	{{ range $pkg, $enum := enumPackages (externalEnums .) }}
+	_ = {{ $pkg }}.{{ $enum.Name }}(0)
 	{{ end }}
 )
 

diff --git a/templates/goshared/register.go b/templates/goshared/register.go
@@ -343,23 +343,32 @@ func (fns goSharedFuncs) enumName(enum pgs.Enum) string {
 	}
 }
 
-func (fns goSharedFuncs) enumPackages(enums []pgs.Enum) map[pgs.Name]pgs.FilePath {
-	out := make(map[pgs.Name]pgs.FilePath, len(enums))
+type NormalizedEnum struct {
+	FilePath pgs.FilePath
+	Name     string
+}
+
+func (fns goSharedFuncs) enumPackages(enums []pgs.Enum) map[pgs.Name]NormalizedEnum {
+	out := make(map[pgs.Name]NormalizedEnum, len(enums))
 
 	nameCollision := make(map[pgs.Name]int)
 
 	for _, en := range enums {
 
 		pkgName := fns.PackageName(en)
 
-		path, ok := out[pkgName]
+		if normalized, ok := out[pkgName]; ok {
+			if normalized.FilePath != fns.ImportPath(en) {
+				nameCollision[pkgName] = nameCollision[pkgName] + 1
+				pkgName = pkgName + pgs.Name(strconv.Itoa(nameCollision[pkgName]))
+			}
+		}
 
-		if ok && path != fns.ImportPath(en) {
-			nameCollision[pkgName] = nameCollision[pkgName] + 1
-			pkgName = pkgName + pgs.Name(strconv.Itoa(nameCollision[pkgName]))
+		out[pkgName] = NormalizedEnum{
+			Name:     fns.enumName(en),
+			FilePath: fns.ImportPath(en),
 		}
 
-		out[pkgName] = fns.ImportPath(en)
 	}
 
 	return out