expand lowerbound when checking type arguments for flexible types

Author: neetopia

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt

@@ -349,7 +349,11 @@ internal fun KtType.classifierSymbol(): KtClassifierSymbol? {
 }
 
 internal fun KtType.typeArguments(): List<KtTypeProjection> {
-    return (this as? KtNonErrorClassType)?.qualifiers?.reversed()?.flatMap { it.typeArguments } ?: emptyList()
+    return if (this is KtFlexibleType) {
+        this.lowerBound
+    } else {
+        this
+    }.let { (it as? KtNonErrorClassType)?.qualifiers?.reversed()?.flatMap { it.typeArguments } ?: emptyList() }
 }
 
 internal fun KSAnnotated.findAnnotationFromUseSiteTarget(): Sequence<KSAnnotation> {

kotlin-analysis-api/testData/replaceWithErrorTypeArgs.kt

@@ -100,6 +100,7 @@
 // KLE.E.asType(emptyList()): KLE
 // default type:A
 // flexible type star:T
+// flexible type replace argument:JS1<Int>
 // END
 
 // MODULE: lib
@@ -123,6 +124,10 @@ class JS<T1, T2> {}
 class JS1<T> {
     T p;
 }
+
+class JavaClass {
+    JS1<?> p;
+}
 enum JSE {
     E
 }
@@ -137,3 +142,4 @@ enum class KSE {
 
 val x: KS<Int, String> = TODO()
 val y: KS<NotExist1, NotExist2> = TODO()
+val z: KL1<Int> = TODO()

test-utils/src/main/kotlin/com/google/devtools/ksp/processor/ReplaceWithErrorTypeArgsProcessor.kt

@@ -50,6 +50,8 @@ open class ReplaceWithErrorTypeArgsProcessor : AbstractTestProcessor() {
         val xargs = x.type.element!!.typeArguments
         val y = resolver.getPropertyDeclarationByName(resolver.getKSNameFromString("y"), true)!!
         val yargs = y.type.element!!.typeArguments
+        val z = resolver.getPropertyDeclarationByName(resolver.getKSNameFromString("z"), true)!!
+        val zargs = z.type.element!!.typeArguments
 
         for (decl in decls) {
             val declName = decl.qualifiedName!!.asString()
@@ -64,6 +66,9 @@ open class ReplaceWithErrorTypeArgsProcessor : AbstractTestProcessor() {
         // TODO: fix flexible type creation once upstream available.
         val js1 = resolver.getClassDeclarationByName("JS1")!!
         results.add("flexible type star:${js1.getDeclaredProperties().single().type.resolve().starProjection()}")
+        val javaClass = resolver.getClassDeclarationByName("JavaClass")!!
+        val genericFlexibleProperty = javaClass.getDeclaredProperties().single().type.resolve()
+        results.add("flexible type replace argument:${genericFlexibleProperty.replace(zargs)}")
         return emptyList()
     }
 

test-utils/testData/api/replaceWithErrorTypeArgs.kt

@@ -100,6 +100,7 @@
 // KLE.E.asType(emptyList()): KLE.E
 // default type:A
 // flexible type star:(T..T?)
+// flexible type replace argument:(JS1<Int>..JS1<Int>?)
 // END
 
 // MODULE: lib
@@ -123,6 +124,10 @@ class JS<T1, T2> {}
 class JS1<T> {
     T p;
 }
+
+class JavaClass {
+    JS1<?> p;
+}
 enum JSE {
     E
 }
@@ -137,3 +142,4 @@ enum class KSE {
 
 val x: KS<Int, String> = TODO()
 val y: KS<NotExist1, NotExist2> = TODO()
+val z: KL1<Int> = TODO()