Merge pull request #2682 from square/use_setters_for_defaults

[swift] Add setter for ProtoDefaulted and CustomDefaulted
square · Oct 16, 2023 · 86caab7 · 86caab7
2 parents fa69a5d + e306fa3
commit 86caab7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ _Unreleased_
     * Similar to `CustomDefaulted, this adds as projection of the protocol defined default value
     * This should not take up any additional storage
     * This is attached to optional scalar values and messages with entirely optional values
+* New: `ProtoDefaulted` and `CustomDefaulted` include setter support
+    * This enables you to do something like `Foo().$bar.$baz += 1`
 
 Version 4.9.1
 -------------

diff --git a/wire-runtime-swift/src/main/swift/propertyWrappers/CustomDefaulted.swift b/wire-runtime-swift/src/main/swift/propertyWrappers/CustomDefaulted.swift
@@ -33,7 +33,12 @@ public struct CustomDefaulted<Value> {
     }
 
     public var projectedValue: Value {
-        wrappedValue ?? defaultValue
+        get  {
+            wrappedValue ?? defaultValue
+        }
+        set {
+            wrappedValue = newValue
+        }
     }
 }
 

diff --git a/wire-runtime-swift/src/main/swift/propertyWrappers/ProtoDefaulted.swift b/wire-runtime-swift/src/main/swift/propertyWrappers/ProtoDefaulted.swift
@@ -35,7 +35,12 @@ public struct ProtoDefaulted<Value: ProtoDefaultedValue> {
     }
 
     public var projectedValue: Value {
-        wrappedValue ?? Value.defaultedValue
+        get  {
+            wrappedValue ?? Value.defaultedValue
+        }
+        set {
+            wrappedValue = newValue
+        }
     }
 }
 

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
@@ -1160,7 +1160,7 @@ class SwiftGenerator private constructor(
       .build()
 
     fileMembers += FileMemberSpec.builder(memberwiseExtension)
-      .addGuard("$FLAG_INCLUDE_MEMBERWISE_INITIALIZER")
+      .addGuard(FLAG_INCLUDE_MEMBERWISE_INITIALIZER)
       .build()
   }
 
@@ -1256,7 +1256,7 @@ class SwiftGenerator private constructor(
       .build()
 
     fileMembers += FileMemberSpec.builder(memberwiseExtension)
-      .addGuard("$FLAG_INCLUDE_MEMBERWISE_INITIALIZER")
+      .addGuard(FLAG_INCLUDE_MEMBERWISE_INITIALIZER)
       .build()
   }