Move SwiftProtobufNamer uniquelyNamedValues to use EnumAliasInfo.

Author: thomasvl

Sources/protoc-gen-swift/EnumGenerator.swift

@@ -116,7 +116,7 @@ class EnumGenerator {
   /// - Parameter p: The code printer.
   private func generateCasesOrAliases(printer p: inout CodePrinter) {
     let visibility = generatorOptions.visibilitySourceSnippet
-    for enumValueDescriptor in namer.uniquelyNamedValues(enum: enumDescriptor) {
+    for enumValueDescriptor in namer.uniquelyNamedValues(valueAliasInfo: aliasInfo) {
       let comments = enumValueDescriptor.protoSourceComments()
       if !comments.isEmpty {
         p.print()

Sources/protoc-gen-swift/SwiftProtobufNamer+Extensions.swift

@@ -20,12 +20,14 @@ extension SwiftProtobufNamer {
   /// names. Only poorly named proto enum alias values get filtered
   /// away, so the assumption is they aren't really needed from an
   /// api pov.
-  func uniquelyNamedValues(enum e: EnumDescriptor) -> [EnumValueDescriptor] {
-    return e.values.filter {
+  func uniquelyNamedValues(
+    valueAliasInfo aliasInfo: EnumDescriptor.ValueAliasInfo
+  ) -> [EnumValueDescriptor] {
+    return aliasInfo.mainValues.first!.enumType.values.filter {
       // Original are kept as is. The computations for relative
       // name already adds values for collisions with different
       // values.
-      guard let aliasOf = $0.aliasOf else { return true }
+      guard let aliasOf = aliasInfo.original(of: $0) else { return true }
       let relativeName = self.relativeName(enumValue: $0)
       let aliasOfRelativeName = self.relativeName(enumValue: aliasOf)
       // If the relative name matches for the alias and original, drop
@@ -34,11 +36,11 @@ extension SwiftProtobufNamer {
       // Only include this alias if it is the first one with this name.
       // (handles alias with different cases in their names that get
       // mangled to a single Swift name.)
-      let firstAlias = aliasOf.aliases.firstIndex {
+      let firstAlias = aliasInfo.aliases(aliasOf)!.firstIndex {
         let otherRelativeName = self.relativeName(enumValue: $0)
         return relativeName == otherRelativeName
       }
-      return aliasOf.aliases[firstAlias!] === $0
+      return aliasInfo.aliases(aliasOf)![firstAlias!] === $0
     }
   }
 }

Tests/protoc-gen-swiftTests/Test_SwiftProtobufNamerExtensions.swift

@@ -71,7 +71,8 @@ class Test_SwiftProtobufNamer: XCTestCase {
 
     // Test uniquelyNamedValues(enum:)
 
-    let filtered = namer.uniquelyNamedValues(enum: e)
+    let aliasInfo = EnumDescriptor.ValueAliasInfo(enumDescriptor: e)
+    let filtered = namer.uniquelyNamedValues(valueAliasInfo: aliasInfo)
     XCTAssertEqual(filtered.count, 3)
 
     XCTAssertEqual(filtered[0].name, "TEST_ENUM_FOO")
@@ -126,7 +127,8 @@ class Test_SwiftProtobufNamer: XCTestCase {
 
     // Test uniquelyNamedValues(enum:)
 
-    let filtered = namer.uniquelyNamedValues(enum: e)
+    let aliasInfo = EnumDescriptor.ValueAliasInfo(enumDescriptor: e)
+    let filtered = namer.uniquelyNamedValues(valueAliasInfo: aliasInfo)
     XCTAssertEqual(filtered.count, 4)
 
     XCTAssertEqual(filtered[0].name, "TEST_ENUM_FOO")
@@ -202,7 +204,8 @@ class Test_SwiftProtobufNamer: XCTestCase {
 
     // Test uniquelyNamedValues(enum:)
 
-    let filtered = namer.uniquelyNamedValues(enum: e)
+    let aliasInfo = EnumDescriptor.ValueAliasInfo(enumDescriptor: e)
+    let filtered = namer.uniquelyNamedValues(valueAliasInfo: aliasInfo)
     XCTAssertEqual(filtered.count, 6)
 
     XCTAssertEqual(filtered[0].name, "TEST_ENUM_FOO")
@@ -286,7 +289,8 @@ class Test_SwiftProtobufNamer: XCTestCase {
 
     // QUX & qux collided, so only one remains.
 
-    let filtered = namer.uniquelyNamedValues(enum: e)
+    let aliasInfo = EnumDescriptor.ValueAliasInfo(enumDescriptor: e)
+    let filtered = namer.uniquelyNamedValues(valueAliasInfo: aliasInfo)
     XCTAssertEqual(filtered.count, 5)
 
     XCTAssertEqual(filtered[0].name, "ALIAS_FOO")