[ObjCExport] Analysis Api: Ensure KDocs being exported by providing ObjCExportStubOrigin

^KT-64888 Fixed


Co-authored-by: Sebastian Sellmair <Sebastian.sellmair@jetbrains.com>


Merge-request: KT-MR-13854
Merged-by: Eugene Levenetc <Eugene.Levenetc@jetbrains.com>

native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/getObjCExportStubOrigin.kt

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.backend.konan.objcexport.ObjCExportStubOrigin
 import org.jetbrains.kotlin.objcexport.analysisApiUtils.getKDocString
 
 context(KtAnalysisSession)
-fun KtSymbol.getObjCStubOrigin(): ObjCExportStubOrigin {
+fun KtSymbol.getObjCExportStubOrigin(): ObjCExportStubOrigin {
     // TODO: Differentiate origins
     // TODO: Extract kdoc from deserialized symbols
     return ObjCExportStubOrigin.Source(

native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCClass.kt

@@ -25,7 +25,7 @@ fun KtClassOrObjectSymbol.translateToObjCClass(): ObjCClass? {
 
     val name = getObjCClassOrProtocolName()
     val comment: ObjCComment? = annotationsList.translateToObjCComment()
-    val origin: ObjCExportStubOrigin = getObjCStubOrigin()
+    val origin: ObjCExportStubOrigin = getObjCExportStubOrigin()
     val superProtocols: List<String> = superProtocols()
     val members: List<ObjCExportStub> = members().flatMap { it.translateToObjCExportStubs() }
     val categoryName: String? = null

native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCConstructor.kt

@@ -15,13 +15,13 @@ fun KtConstructorSymbol.translateToObjCConstructors(): List<ObjCMethod> {
 
     result.add(
         ObjCMethod(
-            null,
+            comment = null,
-            null,
+            origin = getObjCExportStubOrigin(),
-            false,
+            isInstanceMethod = false,
-            ObjCInstanceType,
+            returnType = ObjCInstanceType,
-            listOf("new"),
+            selectors = listOf("new"),
-            emptyList(),
+            parameters = emptyList(),
-            listOf(
+            attributes = listOf(
                 "availability(swift, unavailable, message=\"use object initializers instead\")"
             )
         )

native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCMethod.kt

@@ -48,7 +48,6 @@ internal fun KtFunctionLikeSymbol.buildObjCMethod(
     unavailable: Boolean = false,
 ): ObjCMethod {
     val bridge = getMethodBridge()
-    val origin: ObjCExportStubOrigin? = null
     val returnType: ObjCType = mapReturnType(bridge.returnBridge)
     val parameters = translateToObjCParameters(bridge)
     val selector = getSelector(bridge)
@@ -82,7 +81,7 @@ internal fun KtFunctionLikeSymbol.buildObjCMethod(
 
     return ObjCMethod(
         comment = comment,
-        origin = origin,
+        origin = getObjCExportStubOrigin(),
         isInstanceMethod = bridge.isInstance || isConstructor,
         returnType = returnType,
         selectors = selectors,

native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCProperty.kt

@@ -54,13 +54,13 @@ fun KtPropertySymbol.buildProperty(): ObjCProperty {
     //declarationAttributes.addIfNotNull(mapper.getDeprecation(property)?.toDeprecationAttribute())
 
     return ObjCProperty(
-        name,
+        name = name,
-        null,
+        comment = null,
-        null,
+        origin = getObjCExportStubOrigin(),
-        type!!,
+        type = type!!,
-        attributes,
+        propertyAttributes = attributes,
-        setterName,
+        setterName = setterName,
-        getterName,
+        getterName = getterName,
-        declarationAttributes
+        declarationAttributes = declarationAttributes
     )
 }

native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCProtocol.kt

@@ -33,7 +33,7 @@ fun KtClassOrObjectSymbol.translateToObjCProtocol(): ObjCProtocol? {
     return ObjCProtocolImpl(
         name = name.objCName,
         comment = comment,
-        origin = getObjCStubOrigin(),
+        origin = getObjCExportStubOrigin(),
         attributes = name.toNameAttributes(),
         superProtocols = superProtocols(),
         members = members