Fix support for mutable global properties with non-exposed setter.

touchlab · Feb 9, 2024 · 1b4d6ce · 1b4d6ce
1 parent 53e6f0a
commit 1b4d6ce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/...otlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/element/OirCallableDeclaration.kt b/...otlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/element/OirCallableDeclaration.kt
@@ -17,6 +17,7 @@ sealed interface OirCallableDeclaration : OirElement {
 
     val deprecationLevel: DeprecationLevel
 
+    // TODO This is likely not needed
     val visibility: OirVisibility
         get() = originalSirCallableDeclaration.visibility.toOirVisibility()
 

diff --git a/.../kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirMembersPhase.kt b/.../kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirMembersPhase.kt
@@ -177,7 +177,7 @@ class CreateKirMembersPhase(
             createProperty(descriptor, kirClass, origin)
         }
 
-    private fun getOrCreateOverridenProperty(descriptor: PropertyDescriptor, origin: Origin): KirProperty {
+    private fun getOrCreateOverriddenProperty(descriptor: PropertyDescriptor, origin: Origin): KirProperty {
         val classDescriptor = descriptorProvider.getReceiverClassDescriptorOrNull(descriptor)
             ?: error("Unsupported property $descriptor")
 
@@ -203,13 +203,13 @@ class CreateKirMembersPhase(
             origin = origin,
             scope = kirClass.callableDeclarationScope,
             type = kirTypeTranslator.mapReturnType(originalDescriptor.getter!!, getterBridge.returnBridge),
-            isVar = descriptor.isVar,
+            isVar = descriptor.setter?.let { descriptorProvider.isExposable(it) } ?: false,
             deprecationLevel = descriptor.kirDeprecationLevel,
             isRefinedInSwift = baseDescriptor.isRefinedInSwift,
         )
 
         getDirectParents(descriptor)
-            .map { getOrCreateOverridenProperty(it, origin) }
+            .map { getOrCreateOverriddenProperty(it, origin) }
             .let { property.addOverrides(it) }
 
         return property

diff --git a/...-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/sir/member/CreateSirMembersPhase.kt b/...-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/sir/member/CreateSirMembersPhase.kt
@@ -100,7 +100,8 @@ class CreateSirMembersPhase(
                     throws = false,
                 )
             }
-            property.descriptor.setter?.let {
+
+            if (property.isVar) {
                 SirSetter(
                     throws = false,
                 )