[ObjCExport] Fix the handling of unnamed lambda parameters with objcExportBlockExplicitParameterNames

sbogolepov · Space Team · commit b38b99cddc8a · 2025-09-05T08:51:10.000Z
^KT-77488 Fixed
diff --git a/native/native.tests/testData/framework/objcexport/expectedLazy/expectedLazy.h b/native/native.tests/testData/framework/objcexport/expectedLazy/expectedLazy.h
@@ -543,6 +543,12 @@ __attribute__((swift_name("EnumValuesKt")))
 + (KtNoEnumEntriesEnum *)dceAvoidance __attribute__((swift_name("dceAvoidance()")));
 @end
 
+__attribute__((objc_subclassing_restricted))
+__attribute__((swift_name("ExplicitBlockParameterNamesKt")))
+@interface KtExplicitBlockParameterNamesKt : KtBase
++ (NSString *)callMyParametersExplicitlyPleaseCb:(NSString *(^)(KtInt *, KtInt *, NSString *))cb __attribute__((swift_name("callMyParametersExplicitlyPlease(cb:)")));
+@end
+
 __attribute__((swift_name("FunInterface")))
 @protocol KtFunInterface
 @required
diff --git a/native/native.tests/testData/framework/objcexport/expectedLazy/expectedLazyLegacySuspendUnit.h b/native/native.tests/testData/framework/objcexport/expectedLazy/expectedLazyLegacySuspendUnit.h
@@ -543,6 +543,12 @@ __attribute__((swift_name("EnumValuesKt")))
 + (KtNoEnumEntriesEnum *)dceAvoidance __attribute__((swift_name("dceAvoidance()")));
 @end
 
+__attribute__((objc_subclassing_restricted))
+__attribute__((swift_name("ExplicitBlockParameterNamesKt")))
+@interface KtExplicitBlockParameterNamesKt : KtBase
++ (NSString *)callMyParametersExplicitlyPleaseCb:(NSString *(^)(KtInt *, KtInt *, NSString *))cb __attribute__((swift_name("callMyParametersExplicitlyPlease(cb:)")));
+@end
+
 __attribute__((swift_name("FunInterface")))
 @protocol KtFunInterface
 @required
diff --git a/native/native.tests/testData/framework/objcexport/expectedLazy/expectedLazyNoGenerics.h b/native/native.tests/testData/framework/objcexport/expectedLazy/expectedLazyNoGenerics.h
@@ -543,6 +543,12 @@ __attribute__((swift_name("EnumValuesKt")))
 + (KtNoEnumEntriesEnum *)dceAvoidance __attribute__((swift_name("dceAvoidance()")));
 @end
 
+__attribute__((objc_subclassing_restricted))
+__attribute__((swift_name("ExplicitBlockParameterNamesKt")))
+@interface KtExplicitBlockParameterNamesKt : KtBase
++ (NSString *)callMyParametersExplicitlyPleaseCb:(NSString *(^)(KtInt *, KtInt *, NSString *))cb __attribute__((swift_name("callMyParametersExplicitlyPlease(cb:)")));
+@end
+
 __attribute__((swift_name("FunInterface")))
 @protocol KtFunInterface
 @required
diff --git a/native/native.tests/testData/framework/objcexport/explicitBlockParameterNames.kt b/native/native.tests/testData/framework/objcexport/explicitBlockParameterNames.kt
@@ -0,0 +1,3 @@
+fun callMyParametersExplicitlyPlease(cb: (a: Int, b: Int, c: String) -> String): String {
+    return cb(5, 6, "hello")
+}
diff --git a/native/native.tests/testData/framework/objcexport/explicitBlockParameterNames.swift b/native/native.tests/testData/framework/objcexport/explicitBlockParameterNames.swift
@@ -0,0 +1,13 @@
+import Kt
+
+private func test1() throws {
+    let actual = ExplicitBlockParameterNamesKt.callMyParametersExplicitlyPlease(cb: { a, b, c in "\(a) \(b) \(c)" })
+    try assertEquals(actual: actual, expected: "5 6 hello")
+}
+
+class ExplicitBlockParameterNamesTests : SimpleTestProvider {
+    override init() {
+        super.init()
+        test("Test1", test1)
+    }
+}
diff --git a/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCFunctionType.kt b/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCFunctionType.kt
@@ -19,14 +19,7 @@ internal fun ObjCExportContext.translateToObjCFunctionType(type: KaType, returns
             else translateToObjCReferenceType(returnType)
         },
         parameters = listOfNotNull(type.receiverType).plus(type.parameterTypes).map { parameterType ->
-            val name = if (this@translateToObjCFunctionType.exportSession.configuration.objcExportBlockExplicitParameterNames) {
-                val parameterName = parameterType.getValueFromParameterNameAnnotation()?.asString() ?: ""
-                val mangledName = unifyName(parameterName, usedNames)
-                usedNames += mangledName
-                mangledName
-            } else {
-                ""
-            }
+            val name = blockParameterName(parameterType, usedNames)
             ObjCParameter(
                 name,
                 null,
@@ -38,6 +31,16 @@ internal fun ObjCExportContext.translateToObjCFunctionType(type: KaType, returns
     return analysisSession.withNullabilityOf(objCBlockPointerType, type)
 }
 
+private fun ObjCExportContext.blockParameterName(parameterType: KaType, usedNames: MutableSet<String>): String {
+    return if (this.exportSession.configuration.objcExportBlockExplicitParameterNames) {
+        val parameterName = parameterType.getValueFromParameterNameAnnotation()?.asString()
+            ?: return ""
+        val mangledName = unifyName(parameterName, usedNames)
+        usedNames += mangledName
+        mangledName
+    } else ""
+}
+
 /**
  * See K1 [org.jetbrains.kotlin.builtins.FunctionTypesKt.getReturnTypeFromFunctionType]
  */
diff --git a/native/objcexport-header-generator/impl/analysis-api/test/org/jetbrains/kotlin/objcexport/testUtils/ObjCExportSessionUtil.kt b/native/objcexport-header-generator/impl/analysis-api/test/org/jetbrains/kotlin/objcexport/testUtils/ObjCExportSessionUtil.kt
@@ -18,11 +18,10 @@ import org.jetbrains.kotlin.psi.KtElement
 
 inline fun <T> analyzeWithObjCExport(
     useSiteKtElement: KtElement,
-    configuration: KtObjCExportConfiguration = KtObjCExportConfiguration(),
     action: ObjCExportContext.() -> T,
 ): T = analyze(useSiteKtElement) {
     val kaSession: KaSession = this
-    withKtObjCExportSession(configuration) {
+    withKtObjCExportSession(KtObjCExportConfiguration()) {
         val exportSession = this
         with(ObjCExportContext(kaSession, exportSession)) {
             action.invoke(this)
diff --git a/native/objcexport-header-generator/impl/k1/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportTranslator.kt b/native/objcexport-header-generator/impl/k1/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportTranslator.kt
@@ -998,15 +998,7 @@ class ObjCExportTranslatorImpl(
                 mapReferenceType(functionType.getReturnTypeFromFunctionType(), objCExportScope)
             },
             parameterTypes.map {
-                val uniqueName = when (objcExportBlockExplicitParameterNames) {
-                    true -> {
-                        val parameterName = it.extractParameterNameFromFunctionTypeArgument()?.asString() ?: ""
-                        val name = unifyName(parameterName, usedNames)
-                        usedNames += name
-                        name
-                    }
-                    else -> ""
-                }
+                val uniqueName = blockParameterName(it, usedNames)
                 ObjCParameter(
                     uniqueName,
                     null,
@@ -1016,6 +1008,16 @@ class ObjCExportTranslatorImpl(
         )
     }
 
+    private fun blockParameterName(parameterType: KotlinType, usedNames: MutableSet<String>): String {
+        return if (objcExportBlockExplicitParameterNames) {
+            val parameterName = parameterType.extractParameterNameFromFunctionTypeArgument()?.asString()
+                ?: return ""
+            val name = unifyName(parameterName, usedNames)
+            usedNames += name
+            name
+        } else ""
+    }
+
     private fun mapFunctionType(
         kotlinType: KotlinType,
         objCExportScope: ObjCExportScope,
diff --git a/native/objcexport-header-generator/test/org/jetbrains/kotlin/backend/konan/tests/ObjCExportTypeTranslationTest.kt b/native/objcexport-header-generator/test/org/jetbrains/kotlin/backend/konan/tests/ObjCExportTypeTranslationTest.kt
@@ -401,7 +401,7 @@ class ObjCExportTypeTranslationTest(
         """.trimIndent()
         )
 
-        assertEquals("B *(^)(A *) -> void", header.renderTypesOfSymbol("foo"))
+        assertEquals("B *(^)(A *a) -> void", header.renderTypesOfSymbol("foo"))
     }
 
     @Test
@@ -415,7 +415,7 @@ class ObjCExportTypeTranslationTest(
         """.trimIndent()
         )
 
-        assertEquals("C *(^)(A *, B *) -> void", header.renderTypesOfSymbol("foo"))
+        assertEquals("C *(^)(A *a, B *b) -> void", header.renderTypesOfSymbol("foo"))
     }
 
     @Test
@@ -429,7 +429,7 @@ class ObjCExportTypeTranslationTest(
         """.trimIndent()
         )
 
-        assertEquals("C *(^)(A *, B *) -> void", header.renderTypesOfSymbol("foo"))
+        assertEquals("C *(^)(A *, B *b) -> void", header.renderTypesOfSymbol("foo"))
     }
 
     @Test
diff --git a/native/objcexport-header-generator/testData/dependencies/coroutineDispatcherKey/!coroutineDispatcherKey.h b/native/objcexport-header-generator/testData/dependencies/coroutineDispatcherKey/!coroutineDispatcherKey.h
@@ -38,7 +38,7 @@ __attribute__((objc_subclassing_restricted))
  *   kotlin.ExperimentalStdlibApi
 */
 @interface KotlinAbstractCoroutineContextKey<B, E> : Base <KotlinCoroutineContextKey>
-- (instancetype)initWithBaseKey:(id<KotlinCoroutineContextKey>)baseKey safeCast:(E _Nullable (^)(id<KotlinCoroutineContextElement>))safeCast __attribute__((swift_name("init(baseKey:safeCast:)"))) __attribute__((objc_designated_initializer));
+- (instancetype)initWithBaseKey:(id<KotlinCoroutineContextKey>)baseKey safeCast:(E _Nullable (^)(id<KotlinCoroutineContextElement> element))safeCast __attribute__((swift_name("init(baseKey:safeCast:)"))) __attribute__((objc_designated_initializer));
 @end
 
 
@@ -51,7 +51,7 @@ __attribute__((swift_name("Kotlinx_coroutines_coreCoroutineDispatcher.Key")))
 @interface Kotlinx_coroutines_coreCoroutineDispatcherKey : KotlinAbstractCoroutineContextKey<id<KotlinContinuationInterceptor>, Kotlinx_coroutines_coreCoroutineDispatcher *>
 + (instancetype)alloc __attribute__((unavailable));
 + (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable));
-- (instancetype)initWithBaseKey:(id<KotlinCoroutineContextKey>)baseKey safeCast:(id<KotlinCoroutineContextElement> _Nullable (^)(id<KotlinCoroutineContextElement>))safeCast __attribute__((swift_name("init(baseKey:safeCast:)"))) __attribute__((objc_designated_initializer)) __attribute__((unavailable));
+- (instancetype)initWithBaseKey:(id<KotlinCoroutineContextKey>)baseKey safeCast:(id<KotlinCoroutineContextElement> _Nullable (^)(id<KotlinCoroutineContextElement> element))safeCast __attribute__((swift_name("init(baseKey:safeCast:)"))) __attribute__((objc_designated_initializer)) __attribute__((unavailable));
 + (instancetype)key __attribute__((swift_name("init()")));
 @property (class, readonly, getter=shared) Kotlinx_coroutines_coreCoroutineDispatcherKey *shared __attribute__((swift_name("shared")));
 @end
diff --git a/native/objcexport-header-generator/testData/dependencies/dateTimeUnit/!dateTimeUnit.h b/native/objcexport-header-generator/testData/dependencies/dateTimeUnit/!dateTimeUnit.h
@@ -437,12 +437,12 @@ __attribute__((objc_subclassing_restricted))
 */
 @protocol Kotlinx_serialization_coreSerializersModuleCollector
 @required
-- (void)contextualKClass:(id<KotlinKClass>)kClass provider:(id<Kotlinx_serialization_coreKSerializer> (^)(NSArray<id<Kotlinx_serialization_coreKSerializer>> *))provider __attribute__((swift_name("contextual(kClass:provider:)")));
+- (void)contextualKClass:(id<KotlinKClass>)kClass provider:(id<Kotlinx_serialization_coreKSerializer> (^)(NSArray<id<Kotlinx_serialization_coreKSerializer>> *typeArgumentsSerializers))provider __attribute__((swift_name("contextual(kClass:provider:)")));
 - (void)contextualKClass:(id<KotlinKClass>)kClass serializer:(id<Kotlinx_serialization_coreKSerializer>)serializer __attribute__((swift_name("contextual(kClass:serializer:)")));
 - (void)polymorphicBaseClass:(id<KotlinKClass>)baseClass actualClass:(id<KotlinKClass>)actualClass actualSerializer:(id<Kotlinx_serialization_coreKSerializer>)actualSerializer __attribute__((swift_name("polymorphic(baseClass:actualClass:actualSerializer:)")));
-- (void)polymorphicDefaultBaseClass:(id<KotlinKClass>)baseClass defaultDeserializerProvider:(id<Kotlinx_serialization_coreDeserializationStrategy> _Nullable (^)(NSString * _Nullable))defaultDeserializerProvider __attribute__((swift_name("polymorphicDefault(baseClass:defaultDeserializerProvider:)"))) __attribute__((deprecated("Deprecated in favor of function with more precise name: polymorphicDefaultDeserializer")));
-- (void)polymorphicDefaultDeserializerBaseClass:(id<KotlinKClass>)baseClass defaultDeserializerProvider:(id<Kotlinx_serialization_coreDeserializationStrategy> _Nullable (^)(NSString * _Nullable))defaultDeserializerProvider __attribute__((swift_name("polymorphicDefaultDeserializer(baseClass:defaultDeserializerProvider:)")));
-- (void)polymorphicDefaultSerializerBaseClass:(id<KotlinKClass>)baseClass defaultSerializerProvider:(id<Kotlinx_serialization_coreSerializationStrategy> _Nullable (^)(id))defaultSerializerProvider __attribute__((swift_name("polymorphicDefaultSerializer(baseClass:defaultSerializerProvider:)")));
+- (void)polymorphicDefaultBaseClass:(id<KotlinKClass>)baseClass defaultDeserializerProvider:(id<Kotlinx_serialization_coreDeserializationStrategy> _Nullable (^)(NSString * _Nullable className))defaultDeserializerProvider __attribute__((swift_name("polymorphicDefault(baseClass:defaultDeserializerProvider:)"))) __attribute__((deprecated("Deprecated in favor of function with more precise name: polymorphicDefaultDeserializer")));
+- (void)polymorphicDefaultDeserializerBaseClass:(id<KotlinKClass>)baseClass defaultDeserializerProvider:(id<Kotlinx_serialization_coreDeserializationStrategy> _Nullable (^)(NSString * _Nullable className))defaultDeserializerProvider __attribute__((swift_name("polymorphicDefaultDeserializer(baseClass:defaultDeserializerProvider:)")));
+- (void)polymorphicDefaultSerializerBaseClass:(id<KotlinKClass>)baseClass defaultSerializerProvider:(id<Kotlinx_serialization_coreSerializationStrategy> _Nullable (^)(id value))defaultSerializerProvider __attribute__((swift_name("polymorphicDefaultSerializer(baseClass:defaultSerializerProvider:)")));
 @end
 
 @protocol KotlinKDeclarationContainer
diff --git a/native/objcexport-header-generator/testData/dependencies/kotlinxCoroutines/!kotlinxCoroutines.h b/native/objcexport-header-generator/testData/dependencies/kotlinxCoroutines/!kotlinxCoroutines.h
diff --git a/native/objcexport-header-generator/testData/dependencies/kotlinxSerializationCore/!kotlinxSerializationCore.h b/native/objcexport-header-generator/testData/dependencies/kotlinxSerializationCore/!kotlinxSerializationCore.h
diff --git a/native/objcexport-header-generator/testData/dependencies/mapLikeSerializer/!mapLikeSerializer.h b/native/objcexport-header-generator/testData/dependencies/mapLikeSerializer/!mapLikeSerializer.h
diff --git a/native/objcexport-header-generator/testData/dependencies/serializersModule/!serializersModule.h b/native/objcexport-header-generator/testData/dependencies/serializersModule/!serializersModule.h
diff --git a/native/objcexport-header-generator/testData/headers/nullableFunctionalTypeArgumentsAndReturnTypesTranslated/!nullableFunctionalTypeArgumentsAndReturnTypesTranslated.h b/native/objcexport-header-generator/testData/headers/nullableFunctionalTypeArgumentsAndReturnTypesTranslated/!nullableFunctionalTypeArgumentsAndReturnTypesTranslated.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+fun callMyParametersExplicitlyPlease(cb: (a: Int, b: Int, c: String) -> String): String {`
	`2`	`+ return cb(5, 6, "hello")`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ class ObjCExportTypeTranslationTest(`
`401`	`401`	`""".trimIndent()`
`402`	`402`	`)`
`403`	`403`
`404`		`- assertEquals("B (^)(A ) -> void", header.renderTypesOfSymbol("foo"))`
	`404`	`+ assertEquals("B (^)(A a) -> void", header.renderTypesOfSymbol("foo"))`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`@Test`
`@@ -415,7 +415,7 @@ class ObjCExportTypeTranslationTest(`
`415`	`415`	`""".trimIndent()`
`416`	`416`	`)`
`417`	`417`
`418`		`- assertEquals("C (^)(A , B *) -> void", header.renderTypesOfSymbol("foo"))`
	`418`	`+ assertEquals("C (^)(A a, B *b) -> void", header.renderTypesOfSymbol("foo"))`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`@Test`
`@@ -429,7 +429,7 @@ class ObjCExportTypeTranslationTest(`
`429`	`429`	`""".trimIndent()`
`430`	`430`	`)`
`431`	`431`
`432`		`- assertEquals("C (^)(A , B *) -> void", header.renderTypesOfSymbol("foo"))`
	`432`	`+ assertEquals("C (^)(A , B *b) -> void", header.renderTypesOfSymbol("foo"))`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`@Test`