Skip to content

[swift] Properly disambiguate OneOf enum if it has the same name as enclosing type. #3350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2025
+387 −29
Merged

[swift] Properly disambiguate OneOf enum if it has the same name as enclosing type. #3350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions wire-swift-generator/src/main/java/com/squareup/wire/swift/SwiftGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ class SwiftGenerator private constructor(
addStatement("var %N: %T = %L", field.safeName, localType, initializer)
}
type.oneOfs.forEach { oneOf ->
val enumName = oneOfEnumNames.getValue(oneOf)
val enumName = oneOfSafeDeclaredTypeName(oneOf, type, oneOfEnumNames)
addStatement("var %N: %T = nil", oneOf.name, enumName.makeOptional())
}
if (type.declaredFieldsAndOneOfFields.isNotEmpty()) {
Expand Down Expand Up @@ -1063,7 +1063,7 @@ class SwiftGenerator private constructor(
}
if (includeOneOfs) {
type.oneOfs.forEach { oneOf ->
val enumName = oneOfEnumNames.getValue(oneOf).makeOptional()
val enumName = oneOfSafeDeclaredTypeName(oneOf, type, oneOfEnumNames)
addParameter(
ParameterSpec.builder(oneOf.name, enumName)
.defaultValue("nil")
Expand Down Expand Up @@ -1360,7 +1360,7 @@ class SwiftGenerator private constructor(
}

type.oneOfs.forEach { oneOf ->
val enumName = oneOfEnumNames.getValue(oneOf)
val enumName = oneOfSafeDeclaredTypeName(oneOf, type, oneOfEnumNames)

addProperty(
PropertySpec.varBuilder(oneOf.name, enumName.makeOptional(), PUBLIC)
Expand Down Expand Up @@ -1515,7 +1515,7 @@ class SwiftGenerator private constructor(
}

type.oneOfs.forEach { oneOf ->
val enumName = oneOfEnumNames.getValue(oneOf)
val enumName = oneOfSafeDeclaredTypeName(oneOf, type, oneOfEnumNames)

addProperty(
PropertySpec.varBuilder(oneOf.name, enumName.makeOptional(), PUBLIC)
Expand Down Expand Up @@ -1560,7 +1560,7 @@ class SwiftGenerator private constructor(
fileMembers: MutableList<FileMemberSpec>,
) {
type.oneOfs.forEach { oneOf ->
val enumName = oneOfEnumNames.getValue(oneOf)
val enumName = oneOfSafeDeclaredTypeName(oneOf, type, oneOfEnumNames)

// TODO use a NameAllocator
val writer = if (oneOf.fields.any { it.name == "protoWriter" }) "_protoWriter" else "protoWriter"
Expand Down Expand Up @@ -1649,6 +1649,27 @@ class SwiftGenerator private constructor(
}
}

private fun oneOfSafeDeclaredTypeName(
oneOf: OneOf,
type: MessageType,
oneOfEnumNames: Map<OneOf, DeclaredTypeName>,
): DeclaredTypeName {
var currentType: ProtoType? = type.type

while (currentType != null) {
val simpleName = currentType.simpleName
if (oneOf.name.equals(simpleName, ignoreCase = true)) {
val oneOfTypeName = oneOfEnumNames.getValue(oneOf)
return oneOfTypeName.peerType("${oneOfTypeName.simpleName}_OneOf")
}

val enclosingName = currentType.enclosingTypeOrPackage ?: break
Copy link
Collaborator

@efirestone efirestone Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be continue instead of break?

Copy link
Collaborator Author

@dnkoutso dnkoutso Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think its the same, the continue will run the loop once more but enclosingNamewill benulland thereforecurrentTypewill benulland fall toreturn oneOfEnumNames.getValue(oneOf)without the_OneOf` suffix.

currentType = schema.getType(enclosingName)?.type
}

return oneOfEnumNames.getValue(oneOf)
}

private val ProtoType.encoding: String?
get() = when (this) {
ProtoType.SINT32, ProtoType.SINT64 -> "signed"
Expand Down
Loading
Loading