Fix enum entry renaming phase.

touchlab · Apr 15, 2024 · 2b77c0e · 2b77c0e
1 parent e9d81bf
commit 2b77c0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...in/src/kgp_common/kotlin/co/touchlab/skie/phases/features/enums/EnumEntryRenamingPhase.kt b/...in/src/kgp_common/kotlin/co/touchlab/skie/phases/features/enums/EnumEntryRenamingPhase.kt
@@ -42,11 +42,9 @@ object EnumEntryRenamingPhase : SirPhase {
             }
     }
 
-    context(ScheduledPhase.Context)
     private val KirClass.isSupported: Boolean
         get() = this.originalSirClass.isExported && !this.configuration[EnumInterop.LegacyCaseName]
 
-    context(ScheduledPhase.Context)
     private val KirEnumEntry.isSupported: Boolean
         get() = !this.hasUserDefinedName
 

diff --git a/...in-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateExposedKirTypesPhase.kt b/...in-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateExposedKirTypesPhase.kt
@@ -201,8 +201,8 @@ class CreateExposedKirTypesPhase(
 
     private val ClassDescriptor.hasUserDefinedName: Boolean
         get() = this.annotations.findAnnotation(KonanFqNames.objCName)
-            ?.let { !it.hasArgumentValue("name") && !it.hasArgumentValue("swiftName") }
-            ?: true
+            ?.let { it.hasArgumentValue("name") || it.hasArgumentValue("swiftName") }
+            ?: false
 
     companion object {