Fix nested types inside type with keyword name 2.

touchlab · Sep 25, 2023 · 925eca0 · 925eca0
1 parent 44fbf29
commit 925eca0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/...ompiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/SkiePhaseScheduler.kt b/...ompiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/SkiePhaseScheduler.kt
@@ -35,8 +35,9 @@ import co.touchlab.skie.phases.swift.CompileSwiftPhase
 import co.touchlab.skie.phases.swift.GenerateSirFileCodePhase
 import co.touchlab.skie.phases.swift.SwiftCacheSetupPhase
 import co.touchlab.skie.phases.swift.WriteSirFileContentToDiskPhase
-import co.touchlab.skie.phases.typeconflicts.RenameNestedTypesConflictingWithExternalTypesPhase
 import co.touchlab.skie.phases.typeconflicts.RenameNestedKotlinTypesConflictingWithKeywordsPhase
+import co.touchlab.skie.phases.typeconflicts.RenameNestedTypesConflictingWithExternalTypesPhase
+import co.touchlab.skie.phases.typeconflicts.RenameSkieNamespacesConflictingWithKeywordsPhase
 import co.touchlab.skie.phases.typeconflicts.RenameTypesConflictingWithKotlinModulePhase
 import co.touchlab.skie.phases.typeconflicts.RenameTypesConflictsWithOtherTypesPhase
 import co.touchlab.skie.phases.typeconflicts.TemporarilyRenameTypesConflictingWithExternalModulesPhase
@@ -81,6 +82,7 @@ class SkiePhaseScheduler {
             RemoveKonanManglingPhase,
             RenameNestedTypesConflictingWithExternalTypesPhase,
             RenameNestedKotlinTypesConflictingWithKeywordsPhase,
+            RenameSkieNamespacesConflictingWithKeywordsPhase,
             RenameTypesConflictingWithKotlinModulePhase,
             KotlinRuntimeHidingPhase,
 

diff --git a/...co/touchlab/skie/phases/typeconflicts/RenameSkieNamespacesConflictingWithKeywordsPhase.kt b/...co/touchlab/skie/phases/typeconflicts/RenameSkieNamespacesConflictingWithKeywordsPhase.kt
@@ -0,0 +1,17 @@
+package co.touchlab.skie.phases.typeconflicts
+
+import co.touchlab.skie.phases.SirPhase
+import io.outfoxx.swiftpoet.KEYWORDS
+
+object RenameSkieNamespacesConflictingWithKeywordsPhase : SirPhase {
+
+    context(SirPhase.Context)
+    override fun execute() {
+        swiftModelProvider.exposedTypes
+            .map { sirProvider.getSkieNamespace(it) }
+            .filter { it.simpleName in KEYWORDS }
+            .forEach {
+                it.simpleName += "_"
+            }
+    }
+}