Update wire-swift-generator/src/main/java/com/squareup/wire/swift/Swi…

…ftGenerator.kt Co-authored-by: Benoît Quenaudon <[email protected]>
square · Sep 26, 2023 · 35a6331 · 35a6331
1 parent a8fed3c
commit 35a6331
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/wire-swift-generator/src/main/java/com/squareup/wire/swift/SwiftGenerator.kt b/wire-swift-generator/src/main/java/com/squareup/wire/swift/SwiftGenerator.kt
@@ -159,12 +159,18 @@ class SwiftGenerator private constructor(
     }
 
   private val Field.defaultedValue: CodeBlock?
-    get() = default?.let {
-      return defaultFieldInitializer(type!!, it)
-    } ?: if (isMessage && !isRequiredParameter && !isCollection) {
-        val subType = schema.getType(type!!) as MessageType
-        if (subType!!.fields.all { !it.isRequiredParameter }) CodeBlock.of("%T()", subType.typeName) else null
-    } else null
+    get() {
+      when (val default = default) {
+        null -> {
+          if (!isMessage || isRequiredParameter || isCollection) return null
+          val subType = schema.getType(type!!) as MessageType
+          if (subType.fields.any { it.isRequiredParameter }) return null
+          return CodeBlock.of("%T()", subType.typeName)
+        }
+
+        else -> return defaultFieldInitializer(type!!, default)
+      }
+    }
 
   // see https://protobuf.dev/programming-guides/proto3/#default
   private val Field.proto3InitialValue: String