Fix collision of types and parameter name in Apinotes for extensions.

touchlab · Nov 13, 2023 · 49f60b0 · 49f60b0
1 parent b925411
commit 49f60b0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/element/OirClass.kt b/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/oir/element/OirClass.kt
@@ -63,11 +63,17 @@ val OirClass.superClass: OirClass?
 fun OirClass.renderForwardDeclaration(): String =
     if (typeParameters.isEmpty()) name else "$name<${typeParameters.joinToString(", ") { it.name }}>"
 
-val OirClass.functions: List<OirFunction>
+val OirClass.memberFunctions: List<OirFunction>
     get() = callableDeclarations.filterIsInstance<OirFunction>()
 
 val OirClass.constructors: List<OirConstructor>
     get() = callableDeclarations.filterIsInstance<OirConstructor>()
 
-val OirClass.simpleFunctions: List<OirSimpleFunction>
+val OirClass.memberSimpleFunctions: List<OirSimpleFunction>
     get() = callableDeclarations.filterIsInstance<OirSimpleFunction>()
+
+val OirClass.allFunctions: List<OirFunction>
+    get() = callableDeclarationsIncludingExtensions.filterIsInstance<OirFunction>()
+
+val OirClass.allSimpleFunctions: List<OirSimpleFunction>
+    get() = callableDeclarationsIncludingExtensions.filterIsInstance<OirSimpleFunction>()
diff --git a/.../kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/oir/CreateOirMembersPhase.kt b/.../kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/oir/CreateOirMembersPhase.kt
@@ -93,7 +93,7 @@ class CreateOirMembersPhase(
     }
 
     private fun getOirCallableDeclarationParent(kirCallableDeclaration: KirCallableDeclaration<*>): OirCallableDeclarationParent =
-        if (kirCallableDeclaration.origin == KirCallableDeclaration.Origin.Extension && kirCallableDeclaration.owner.kind != KirClass.Kind.Interface) {
+        if (kirCallableDeclaration.origin == KirCallableDeclaration.Origin.Extension && kirCallableDeclaration.owner.kind != KirClass.Kind.File) {
             getOrCreateExtension(kirCallableDeclaration.owner.oirClass)
         } else {
             kirCallableDeclaration.owner.oirClass

diff --git a/...kgp_common/kotlin/co/touchlab/skie/phases/oir/FixOirFunctionSignaturesForApiNotesPhase.kt b/...kgp_common/kotlin/co/touchlab/skie/phases/oir/FixOirFunctionSignaturesForApiNotesPhase.kt
@@ -5,10 +5,10 @@ import co.touchlab.skie.oir.element.OirFunction
 import co.touchlab.skie.oir.element.OirSimpleFunction
 import co.touchlab.skie.oir.element.OirTypeDef
 import co.touchlab.skie.oir.element.OirVisibility
-import co.touchlab.skie.oir.element.functions
+import co.touchlab.skie.oir.element.allFunctions
+import co.touchlab.skie.oir.element.memberFunctions
 import co.touchlab.skie.oir.type.BlockPointerOirType
 import co.touchlab.skie.oir.type.DeclaredOirType
-import co.touchlab.skie.oir.type.NonNullReferenceOirType
 import co.touchlab.skie.oir.type.NullableReferenceOirType
 import co.touchlab.skie.oir.type.OirType
 import co.touchlab.skie.oir.type.PointerOirType
@@ -39,7 +39,7 @@ class FixOirFunctionSignaturesForApiNotesPhase(
     }
 
     private fun fixFunctionSignatures(oirClass: OirClass) {
-        oirClass.functions.forEach {
+        oirClass.allFunctions.forEach {
             fixFunctionSignature(it)
         }
     }

diff --git a/...c/kgp_common/kotlin/co/touchlab/skie/phases/other/FixDuplicatedOverridenFunctionsPhase.kt b/...c/kgp_common/kotlin/co/touchlab/skie/phases/other/FixDuplicatedOverridenFunctionsPhase.kt
@@ -2,7 +2,7 @@ package co.touchlab.skie.phases.other
 
 import co.touchlab.skie.oir.element.OirSimpleFunction
 import co.touchlab.skie.oir.element.copyValueParametersFrom
-import co.touchlab.skie.oir.element.simpleFunctions
+import co.touchlab.skie.oir.element.memberSimpleFunctions
 import co.touchlab.skie.phases.SirPhase
 import co.touchlab.skie.sir.element.SirVisibility
 import co.touchlab.skie.sir.element.copyValueParametersFrom
@@ -16,7 +16,7 @@ object FixDuplicatedOverridenFunctionsPhase : SirPhase {
     context(SirPhase.Context)
     override fun execute() {
         oirProvider.allKotlinClassesAndProtocols
-            .flatMap { it.simpleFunctions }
+            .flatMap { it.memberSimpleFunctions }
             .forEach {
                 fixDuplicates(it)
             }