Fix duplicate import names when same name used in different contexts

gogo · awalterschulze · Nov 9, 2017 · Oct 5, 2017 · Oct 5, 2017 · Oct 5, 2017
commit 563235ae10e9069b3088c63bc9edeb88b7c96065
diff --git a/Makefile b/Makefile
@@ -88,6 +88,7 @@ regenerate:
 	make -C test/issue42order regenerate
 	make -C proto generate-test-pbs
 	make -C test/importdedup regenerate
+	make -C test/importduplicate regenerate
 	make -C test/custombytesnonstruct regenerate
 	make -C test/required regenerate
 	make -C test/casttype regenerate

diff --git a/_conformance/conformance_proto/conformance.pb.go b/_conformance/conformance_proto/conformance.pb.go
diff --git a/jsonpb/jsonpb_test_proto/test_objects.pb.go b/jsonpb/jsonpb_test_proto/test_objects.pb.go
diff --git a/protoc-gen-gogo/generator/generator.go b/protoc-gen-gogo/generator/generator.go
@@ -715,36 +715,26 @@ var pkgNamesInUse = make(map[string][]*FileDescriptor)
 // Pkg is the candidate name.  If f is nil, it's a builtin package like "proto" and
 // has no file descriptor.
 func RegisterUniquePackageName(pkg string, f *FileDescriptor) string {
-	// Ensure that package names across multiple imports are unique, unless they
-	// are builtin or standard lib packages, in which case they should not conflict.
-	if f != nil {
-		// Convert dots to underscores before finding a unique alias.
-		pkg = strings.Map(badToUnderscore, pkg)
-	} else {
-		return pkg[strings.LastIndex(pkg, "/")+1:]
+	// Ensure that package names across multiple imports are unique.
+	if f == nil {
+		pkg = pkg[strings.LastIndex(pkg, "/")+1:]
+		for i := 0; pkgNamesInUse[pkg] != nil; i++ {
+			if i > 0 {
+				pkg = pkg + strconv.Itoa(i)
+			}
+		}
+		return pkg
 	}
 
-	var i = -1
-	var ptr *FileDescriptor = nil
-	for i, ptr = range pkgNamesInUse[pkg] {
+	// Convert dots to underscores before finding a unique alias.
+	pkg = strings.Map(badToUnderscore, pkg)
+	for _, ptr := range pkgNamesInUse[pkg] {
 		if ptr == f {
-			if i == 0 {
-				return pkg
-			}
-			return pkg + strconv.Itoa(i)
+			return pkg
 		}
 	}
-
 	pkgNamesInUse[pkg] = append(pkgNamesInUse[pkg], f)
-	i += 1
-
-	if i > 0 {
-		pkg = pkg + strconv.Itoa(i)
-	}
-
-	if f != nil {
-		uniquePackageName[f.FileDescriptorProto] = pkg
-	}
+	uniquePackageName[f.FileDescriptorProto] = pkg
 	return pkg
 }
 

diff --git a/test/importduplicate/importduplicate.pb.go b/test/importduplicate/importduplicate.pb.go
diff --git a/test/importduplicate/importduplicatepb_test.go b/test/importduplicate/importduplicatepb_test.go