asMemberOf: substitude upper and lower bounds recursively

for flexible types. (cherry picked from commit c95b34c)
google · Oct 5, 2024 · 8bdc388 · 8bdc388
1 parent d155715
commit 8bdc388
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt
@@ -608,7 +608,11 @@ internal fun KaValueParameterSymbol.getDefaultValue(): KaAnnotationValue? {
 internal fun fillInDeepSubstitutor(context: KaType, substitutorBuilder: KaSubstitutorBuilder) {
     val unwrappedType = when (context) {
         is KaClassType -> context
-        is KaFlexibleType -> context.lowerBound as? KaClassType ?: return
+        is KaFlexibleType -> {
+            fillInDeepSubstitutor(context.upperBound, substitutorBuilder)
+            fillInDeepSubstitutor(context.lowerBound, substitutorBuilder)
+            return
+        }
         else -> return
     }
     val parameters = unwrappedType.symbol.typeParameters

diff --git a/kotlin-analysis-api/testData/asMemberOf.kt b/kotlin-analysis-api/testData/asMemberOf.kt
@@ -18,6 +18,18 @@
 // WITH_RUNTIME
 // TEST PROCESSOR: AsMemberOfProcessor
 // EXPECTED:
+// main.Test: MutableIterator<(String..String?)>
+// main.Test: Iterator<(String..String?)>
+// main.Test: MutableIterator<(String..String?)>
+// lib.Test: MutableIterator<(String..String?)>
+// lib.Test: Iterator<(String..String?)>
+// lib.Test: MutableIterator<(String..String?)>
+// main.TestKt: MutableIterator<String>
+// main.TestKt: Iterator<String>
+// main.TestKt: MutableIterator<String>
+// lib.TestKt: MutableIterator<String>
+// lib.TestKt: Iterator<String>
+// lib.TestKt: MutableIterator<String>
 // Child1!!
 // intType: kotlin.Int!!
 // baseTypeArg1: kotlin.Int!!

diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/AsMemberOfProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/AsMemberOfProcessor.kt
@@ -19,14 +19,17 @@ class AsMemberOfProcessor : AbstractTestProcessor() {
 
         listOf("main.Test", "lib.Test", "main.TestKt", "lib.TestKt").forEach { clsName ->
             resolver.getClassDeclarationByName(clsName)!!.let { cls ->
-                val listType = cls.getAllFunctions().single {it.simpleName.asString() == "f"}.returnType!!.resolve()
+                val listType = cls.getAllFunctions().single { it.simpleName.asString() == "f" }.returnType!!.resolve()
                 val listDecl = listType.declaration as KSClassDeclaration
                 val iterator = listDecl.getAllFunctions().single { it.simpleName.asString() == "iterator" }
-                println("$clsName: ${iterator.asMemberOf(listType).returnType}")
-                val listIterator = resolver.getClassDeclarationByName("kotlin.collections.List")!!.getDeclaredFunctions().single { it.simpleName.asString() == "iterator" }
-                println("$clsName: ${listIterator.asMemberOf(listType).returnType}")
-                val mutableListIterator = resolver.getClassDeclarationByName("kotlin.collections.MutableCollection")!!.getDeclaredFunctions().single { it.simpleName.asString() == "iterator" }
-                println("$clsName: ${mutableListIterator.asMemberOf(listType).returnType}")
+                results.add("$clsName: ${iterator.asMemberOf(listType).returnType}")
+                val listIterator = resolver.getClassDeclarationByName("kotlin.collections.List")!!
+                    .getDeclaredFunctions().single { it.simpleName.asString() == "iterator" }
+                results.add("$clsName: ${listIterator.asMemberOf(listType).returnType}")
+                val mutableListIterator =
+                    resolver.getClassDeclarationByName("kotlin.collections.MutableCollection")!!
+                        .getDeclaredFunctions().single { it.simpleName.asString() == "iterator" }
+                results.add("$clsName: ${mutableListIterator.asMemberOf(listType).returnType}")
             }
         }
 

diff --git a/test-utils/testData/api/asMemberOf.kt b/test-utils/testData/api/asMemberOf.kt
@@ -18,6 +18,18 @@
 // WITH_RUNTIME
 // TEST PROCESSOR: AsMemberOfProcessor
 // EXPECTED:
+// main.Test: MutableIterator<(String..String?)>
+// main.Test: Iterator<(String..String?)>
+// main.Test: MutableIterator<(String..String?)>
+// lib.Test: MutableIterator<(String..String?)>
+// lib.Test: Iterator<(String..String?)>
+// lib.Test: MutableIterator<(String..String?)>
+// main.TestKt: MutableIterator<String>
+// main.TestKt: Iterator<String>
+// main.TestKt: MutableIterator<String>
+// lib.TestKt: MutableIterator<String>
+// lib.TestKt: Iterator<String>
+// lib.TestKt: MutableIterator<String>
 // Child1!!
 // intType: kotlin.Int!!
 // baseTypeArg1: kotlin.Int!!