Fix an overload collision of onEnum(of:) caused by its optional overl…

…oad.
touchlab · Mar 6, 2024 · b25e832 · b25e832
1 parent a2e449b
commit b25e832
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/..._common/kotlin/co/touchlab/skie/phases/features/sealed/SealedFunctionGeneratorDelegate.kt b/..._common/kotlin/co/touchlab/skie/phases/features/sealed/SealedFunctionGeneratorDelegate.kt
@@ -26,6 +26,7 @@ class SealedFunctionGeneratorDelegate(
     fun generate(kirClass: KirClass, enum: SirClass) {
         val requiredFunction = generateRequiredOverload(kirClass, enum)
         generateOptionalOverload(kirClass, enum, requiredFunction)
+        generateRequiredOverloadWithOptionalReturnType(kirClass, enum, requiredFunction)
     }
 
     private fun generateRequiredOverload(kirClass: KirClass, enum: SirClass): SirSimpleFunction =
@@ -44,6 +45,16 @@ class SealedFunctionGeneratorDelegate(
         }
     }
 
+    private fun generateRequiredOverloadWithOptionalReturnType(kirClass: KirClass, enum: SirClass, requiredFunction: SirSimpleFunction) {
+        createFunctionDeclaration(
+            kirClass = kirClass,
+            enum = enum,
+            returnTypeModifier = { it.toNullable() },
+        ).apply {
+            addRequiredOverloadWithOptionalReturnTypeFunctionBody(requiredFunction)
+        }
+    }
+
     private fun createFunctionDeclaration(
         kirClass: KirClass,
         enum: SirClass,
@@ -175,4 +186,16 @@ class SealedFunctionGeneratorDelegate(
             )
         }
     }
+
+    private fun SirSimpleFunction.addRequiredOverloadWithOptionalReturnTypeFunctionBody(requiredFunction: SirSimpleFunction) {
+        bodyBuilder.add {
+            val valueParameter = valueParameters.first()
+
+            addCode(
+                CodeBlock.builder()
+                    .add("return %L as %T", requiredFunction.call(valueParameter), requiredFunction.returnType.evaluate().swiftPoetTypeName)
+                    .build(),
+            )
+        }
+    }
 }