Don't require receiver label for KSP declarations

Matching the default Kotlin behaviour
rickclephas · Jul 27, 2024 · 9865536 · 9865536
1 parent a7cad96
commit 9865536
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/...oroutines-ksp/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/ksp/AnnotationSpecs.kt b/...oroutines-ksp/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/ksp/AnnotationSpecs.kt
@@ -49,7 +49,7 @@ private fun KSAnnotation.toObjCNameAnnotationSpec(objCName: String?): Annotation
 }
 
 @Suppress("FunctionName")
-private fun ObjCNameAnnotationSpec(name: String?, swiftName: String?): AnnotationSpec =
+internal fun ObjCNameAnnotationSpec(name: String?, swiftName: String?): AnnotationSpec =
     AnnotationSpec.builder(objCNameAnnotationClassName).apply {
         if (name != null)
             addMember("%N = %S", "name", name)

diff --git a/...s-ksp/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/ksp/NativeCoroutinesFunSpec.kt b/...s-ksp/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/ksp/NativeCoroutinesFunSpec.kt
@@ -38,7 +38,9 @@ internal fun KSFunctionDeclaration.toNativeCoroutinesFunSpec(
         builder.receiver(classDeclaration.toTypeName(typeParameterResolver))
         if (extensionReceiver != null) {
             val type = extensionReceiver.toTypeName(typeParameterResolver)
-            receiverParameter = ParameterSpec.builder("receiver", type).build().also(builder::addParameter)
+            receiverParameter = ParameterSpec.builder("receiver", type)
+                .addAnnotation(ObjCNameAnnotationSpec(null, "_"))
+                .build().also(builder::addParameter)
         }
     } else if (extensionReceiver != null) {
         builder.receiver(extensionReceiver.toTypeName(typeParameterResolver))

diff --git a/...p/src/test/kotlin/com/rickclephas/kmp/nativecoroutines/ksp/CoroutineScopeProviderTests.kt b/...p/src/test/kotlin/com/rickclephas/kmp/nativecoroutines/ksp/CoroutineScopeProviderTests.kt
@@ -231,7 +231,7 @@ class CoroutineScopeProviderTests: CompilationTests() {
         import kotlin.run
         
         @ObjCName(name = "returnSuspendValue")
-        public fun MyClass.returnSuspendValueNative(`receiver`: MyOtherClass): NativeSuspend<String> =
-            nativeSuspend(null) { run { `receiver`.returnSuspendValue() } }
+        public fun MyClass.returnSuspendValueNative(@ObjCName(swiftName = "_") `receiver`: MyOtherClass):
+            NativeSuspend<String> = nativeSuspend(null) { run { `receiver`.returnSuspendValue() } }
     """.trimIndent())
 }
diff --git a/.../src/test/kotlin/com/rickclephas/kmp/nativecoroutines/ksp/NativeCoroutinesFunSpecTests.kt b/.../src/test/kotlin/com/rickclephas/kmp/nativecoroutines/ksp/NativeCoroutinesFunSpecTests.kt
@@ -314,8 +314,8 @@ class NativeCoroutinesFunSpecTests: CompilationTests() {
         import kotlin.run
         
         @ObjCName(name = "returnReceiverValue")
-        public fun MyClass.returnReceiverValueNative(`receiver`: String): NativeSuspend<String> =
-            nativeSuspend(null) { run { `receiver`.returnReceiverValue() } }
+        public fun MyClass.returnReceiverValueNative(@ObjCName(swiftName = "_") `receiver`: String):
+            NativeSuspend<String> = nativeSuspend(null) { run { `receiver`.returnReceiverValue() } }
     """.trimIndent())
 
     @Test