KT-66882: treat classes marked with HiddenFromObjC as Private in Swift Export ^KT-66882 fixed

Author: mMaxy

native/swift/sir-providers/src/org/jetbrains/kotlin/sir/providers/impl/SirVisibilityCheckerImpl.kt

@@ -10,9 +10,11 @@ import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.components.DefaultTypeClassIds
 import org.jetbrains.kotlin.analysis.api.export.utilities.isClone
 import org.jetbrains.kotlin.analysis.api.symbols.*
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaAnnotatedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KaType
 import org.jetbrains.kotlin.analysis.api.types.symbol
 import org.jetbrains.kotlin.builtins.StandardNames
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.sir.SirVisibility
 import org.jetbrains.kotlin.sir.providers.SirSession
@@ -57,6 +59,9 @@ public class SirVisibilityCheckerImpl(
         if (ktSymbol is KaCallableSymbol && ktSymbol.contextParameters.isNotEmpty()) {
             return SirVisibility.PRIVATE
         }
+        if (containsHidesFromObjCAnnotation(ktSymbol)) {
+            return SirVisibility.PRIVATE
+        }
         val isExported = when (ktSymbol) {
             is KaNamedClassSymbol -> {
                 ktSymbol.isExported(ktAnalysisSession) && !ktSymbol.hasHiddenAncestors(ktAnalysisSession)
@@ -168,4 +173,13 @@ public class SirVisibilityCheckerImpl(
     }
 }
 
-private val SUPPORTED_SYMBOL_ORIGINS = setOf(KaSymbolOrigin.SOURCE, KaSymbolOrigin.LIBRARY)
+private fun KaSession.containsHidesFromObjCAnnotation(symbol: KaAnnotatedSymbol): Boolean {
+    return symbol.annotations.any { annotation ->
+        val annotationClassId = annotation.classId ?: return@any false
+        val annotationClassSymbol = findClass(annotationClassId) ?: return@any false
+        ClassId.topLevel(FqName("kotlin.native.HidesFromObjC")) in annotationClassSymbol.annotations
+    }
+}
+
+
+private val SUPPORTED_SYMBOL_ORIGINS = setOf(KaSymbolOrigin.SOURCE, KaSymbolOrigin.LIBRARY)

native/swift/swift-export-standalone-integration-tests/simple/testData/generation/hiddenFromObjectiveC/golden_result/ExportedKotlinPackages/ExportedKotlinPackages.swift

@@ -0,0 +1 @@
+

native/swift/swift-export-standalone-integration-tests/simple/testData/generation/hiddenFromObjectiveC/golden_result/main/main.h

@@ -0,0 +1 @@
+

native/swift/swift-export-standalone-integration-tests/simple/testData/generation/hiddenFromObjectiveC/golden_result/main/main.kt

@@ -0,0 +1 @@
+@file:kotlin.Suppress("DEPRECATION_ERROR")

native/swift/swift-export-standalone-integration-tests/simple/testData/generation/hiddenFromObjectiveC/golden_result/main/main.swift

@@ -0,0 +1,8 @@
+import KotlinRuntime
+import KotlinRuntimeSupport
+
+public func consume_hidden_class(
+    arg: Swift.Never
+) -> Swift.Void {
+    fatalError()
+}

native/swift/swift-export-standalone-integration-tests/simple/testData/generation/hiddenFromObjectiveC/hiddenFromObjectiveC.kt

@@ -0,0 +1,9 @@
+// KIND: STANDALONE
+// MODULE: main
+// FILE: main.kt
+
+@OptIn(kotlin.experimental.ExperimentalObjCRefinement::class)
+@HiddenFromObjC
+class ThisShouldBeHidden
+
+fun consume_hidden_class(arg: ThisShouldBeHidden): Unit = TODO()

native/swift/swift-export-standalone-integration-tests/simple/tests-gen/org/jetbrains/kotlin/swiftexport/standalone/test/KlibBasedSwiftExportRunnerTest.java

@@ -91,6 +91,12 @@ public void testFunctions() {
     runTest("native/swift/swift-export-standalone-integration-tests/simple/testData/generation/functions/");
   }
 
+  @Test
+  @TestMetadata("hiddenFromObjectiveC")
+  public void testHiddenFromObjectiveC() {
+    runTest("native/swift/swift-export-standalone-integration-tests/simple/testData/generation/hiddenFromObjectiveC/");
+  }
+
   @Test
   @TestMetadata("identifiers")
   public void testIdentifiers() {