Fix incorrect interaction of FixNamesOfInaccessibleNestedClassesPhase…

… and CommitSirIsReplacedPropertyPhase.
touchlab · May 16, 2024 · 6fa8929 · 6fa8929
1 parent 50fdf87
commit 6fa8929
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...nMain/kotlin/co/touchlab/skie/phases/sir/type/FixNamesOfInaccessibleNestedClassesPhase.kt b/...nMain/kotlin/co/touchlab/skie/phases/sir/type/FixNamesOfInaccessibleNestedClassesPhase.kt
@@ -16,11 +16,11 @@ object FixNamesOfInaccessibleNestedClassesPhase : SirPhase {
     private fun fixNameOfInaccessibleNestedClass(kirClass: KirClass) {
         val swiftName = kirClass.swiftName
 
-        val hasIncorrectName = swiftName.contains(".") && swiftName != kirClass.originalSirClass.fqName.toLocalString()
+        val hasIncorrectName = swiftName.contains(".") && kirClass.originalSirClass.namespace == null
 
         if (hasIncorrectName) {
             val containingClassName = swiftName.substringBefore(".")
-            val simpleName = swiftName.substringAfter(".")
+            val simpleName = kirClass.originalSirClass.baseName
 
             kirClass.originalSirClass.baseName = containingClassName + simpleName.replaceFirstChar(Char::uppercaseChar)
         }

diff --git a/...piler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/LinkerPhaseScheduler.kt b/...piler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/LinkerPhaseScheduler.kt
@@ -184,15 +184,14 @@ class LinkerPhaseScheduler : SkiePhaseScheduler {
             InitializeSirOverridesPhase,
             InitializeSirMembersCachePhase,
             StripKonanCallableDeclarationManglingPhase,
+            FixNamesOfInaccessibleNestedClassesPhase,
             CommitSirIsReplacedPropertyPhase,
 
             PropagateSirVisibilityToClassesPhase,
             PropagateSirVisibilityToTypeAliasesPhase,
             PropagateSirVisibilityToNonAbstractMembersPhase,
             PropagateSirVisibilityToAbstractMembersPhase,
 
-            FixNamesOfInaccessibleNestedClassesPhase,
-
             RenameTypesConflictingWithKeywordsPhase,
             RenameTypesConflictingWithKotlinModulePhase,