Merge pull request #73 from ema987/feat/addOptionalClosureParameterSu…

…pport Add support for optional closure parameter
outfoxx · Apr 26, 2023 · 75218cf · 75218cf
2 parents f86bc1f + 1ac4978
commit 75218cf
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 1 deletion.
diff --git a/src/main/java/io/outfoxx/swiftpoet/ParameterizedTypeName.kt b/src/main/java/io/outfoxx/swiftpoet/ParameterizedTypeName.kt
@@ -64,7 +64,20 @@ class ParameterizedTypeName internal constructor(
 
   override fun emit(out: CodeWriter): CodeWriter {
     when (rawType) {
-      OPTIONAL -> out.emitCode("%T?", typeArguments[0])
+      OPTIONAL -> {
+        typeArguments[0].apply {
+          when (this) {
+            is FunctionTypeName -> {
+              out.emitCode("(")
+              out.emitCode("%T", this)
+              out.emitCode(")?")
+            }
+            else -> {
+              out.emitCode("%T?", this)
+            }
+          }
+        }
+      }
       IMPLICIT -> out.emitCode("%T!", typeArguments[0])
       ARRAY -> out.emitCode("[%T]", typeArguments[0])
       DICTIONARY -> out.emitCode("[%T : %T]", typeArguments[0], typeArguments[1])

diff --git a/src/test/java/io/outfoxx/swiftpoet/test/FunctionSpecTests.kt b/src/test/java/io/outfoxx/swiftpoet/test/FunctionSpecTests.kt
@@ -173,6 +173,89 @@ class FunctionSpecTests {
     )
   }
 
+  @Test
+  @DisplayName("Generates correct optional closure parameters")
+  fun testGenerateOptionalClosureParameters() {
+    val closureTypeName =
+      FunctionTypeName.get(listOf(ParameterSpec.unnamed(STRING), ParameterSpec.unnamed(INT)), STRING)
+        .makeOptional()
+    val testFunc = FunctionSpec.builder("test")
+      .addParameter(
+        ParameterSpec.builder("closure", closureTypeName)
+          .build()
+      )
+      .build()
+
+    val out = StringWriter()
+    testFunc.emit(CodeWriter(out), null, setOf())
+
+    assertThat(
+      out.toString(),
+      equalTo(
+        """
+            func test(closure: ((Swift.String, Swift.Int) -> Swift.String)?) {
+            }
+
+        """.trimIndent()
+      )
+    )
+  }
+
+  @Test
+  @DisplayName("Generates correct closure optional return type")
+  fun testGenerateClosureOptionalReturnType() {
+    val closureTypeName =
+      FunctionTypeName.get(listOf(ParameterSpec.unnamed(STRING), ParameterSpec.unnamed(INT)), STRING.makeOptional())
+    val testFunc = FunctionSpec.builder("test")
+      .addParameter(
+        ParameterSpec.builder("closure", closureTypeName)
+          .build()
+      )
+      .build()
+
+    val out = StringWriter()
+    testFunc.emit(CodeWriter(out), null, setOf())
+
+    assertThat(
+      out.toString(),
+      equalTo(
+        """
+            func test(closure: (Swift.String, Swift.Int) -> Swift.String?) {
+            }
+
+        """.trimIndent()
+      )
+    )
+  }
+
+  @Test
+  @DisplayName("Generates correct optional closure parameters and optional return type")
+  fun testGenerateOptionalClosureParametersAndOptionalReturnType() {
+    val closureTypeName =
+      FunctionTypeName.get(listOf(ParameterSpec.unnamed(STRING), ParameterSpec.unnamed(INT)), STRING.makeOptional())
+        .makeOptional()
+    val testFunc = FunctionSpec.builder("test")
+      .addParameter(
+        ParameterSpec.builder("closure", closureTypeName)
+          .build()
+      )
+      .build()
+
+    val out = StringWriter()
+    testFunc.emit(CodeWriter(out), null, setOf())
+
+    assertThat(
+      out.toString(),
+      equalTo(
+        """
+            func test(closure: ((Swift.String, Swift.Int) -> Swift.String?)?) {
+            }
+
+        """.trimIndent()
+      )
+    )
+  }
+
   @Test
   @DisplayName("Generates escaping closure parameters")
   fun testGenerateEscapingClosureParameters() {