Improve type name collision detection to rename only necessary types.

Author: FilipDolnik

SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/SkiePhaseScheduler.kt

@@ -62,9 +62,7 @@ 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.RenameNestedKotlinTypesConflictingWithKeywordsPhase
-import co.touchlab.skie.phases.typeconflicts.RenameNestedTypesConflictingWithExternalTypesPhase
-import co.touchlab.skie.phases.typeconflicts.RenameSkieNamespacesConflictingWithKeywordsPhase
+import co.touchlab.skie.phases.typeconflicts.RenameTypesConflictingWithKeywordsPhase
 import co.touchlab.skie.phases.typeconflicts.RenameTypesConflictingWithKotlinModulePhase
 import co.touchlab.skie.phases.typeconflicts.RenameTypesConflictsWithOtherTypesPhase
 import co.touchlab.skie.phases.typeconflicts.TemporarilyRenameTypesConflictingWithExternalModulesPhase
@@ -137,10 +135,8 @@ class SkiePhaseScheduler {
             StripKonanCallableDeclarationManglingPhase,
 
             FixNamesOfInaccessibleNestedClassesPhase,
-            RenameSkieNamespacesConflictingWithKeywordsPhase,
 
-            RenameNestedTypesConflictingWithExternalTypesPhase,
-            RenameNestedKotlinTypesConflictingWithKeywordsPhase,
+            RenameTypesConflictingWithKeywordsPhase,
             RenameTypesConflictingWithKotlinModulePhase,
 
             KotlinRuntimeHidingPhase,

SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/typeconflicts/RenameNestedKotlinTypesConflictingWithKeywordsPhase.kt

@@ -0,0 +1,21 @@
+package co.touchlab.skie.phases.typeconflicts
+
+import co.touchlab.skie.phases.SirPhase
+
+object RenameTypesConflictingWithKeywordsPhase : SirPhase {
+
+    private val problematicKeywords = listOf(
+        "Protocol",
+        "Self",
+        "Type",
+    )
+
+    context(SirPhase.Context)
+    override fun execute() {
+        sirProvider.allLocalTypeDeclarations
+            .filter { it.simpleName in problematicKeywords }
+            .forEach {
+                it.baseName += "_"
+            }
+    }
+}