fix java type resolution for checked exception

google · Jan 17, 2024 · e5e9e5d · e5e9e5d
1 parent 5083a96
commit e5e9e5d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/ResolverImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/ResolverImpl.kt
@@ -898,7 +898,8 @@ class ResolverImpl(
         return when (function.origin) {
             Origin.JAVA -> {
                 val psi = (function as KSFunctionDeclarationJavaImpl).psi
-                psi.throwsList.referencedTypes.asSequence().map { getKSTypeCached(resolveJavaType(it)) }
+                psi.throwsList.referencedTypes.asSequence()
+                    .map { KSTypeReferenceJavaImpl.getCached(it, function).resolve() }
             }
             Origin.KOTLIN -> {
                 extractThrowsAnnotation(function)

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/ResolverAAImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/ResolverAAImpl.kt
@@ -385,7 +385,7 @@ class ResolverAAImpl(
                 val psi = (function as KSFunctionDeclarationImpl).ktFunctionSymbol.psi as PsiMethod
                 psi.throwsList.referencedTypes.asSequence().mapNotNull {
                     analyze {
-                        it.resolve()?.qualifiedName?.let { getClassDeclarationByName(it)?.asStarProjectedType() }
+                        it.asKtType(psi)?.let { KSTypeImpl.getCached(it) }
                     }
                 }
             }

diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/ThrowListProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/ThrowListProcessor.kt
@@ -36,6 +36,15 @@ class ThrowListProcessor : AbstractTestProcessor() {
                     )
             ).toResult()
         )
+        result.add(
+            resolver.getJvmCheckedException(
+                (
+                    jlass.declarations.single {
+                        it.simpleName.asString() == "method"
+                    } as KSFunctionDeclaration
+                    )
+            ).toResult()
+        )
         val propertyA = klass.declarations.single { it.simpleName.asString() == "a" } as KSPropertyDeclaration
         result.add(resolver.getJvmCheckedException(propertyA.getter!!).toResult())
         result.add(resolver.getJvmCheckedException(propertyA.setter!!).toResult())

diff --git a/test-utils/testData/api/throwList.kt b/test-utils/testData/api/throwList.kt
@@ -20,6 +20,7 @@
 // EXPECTED:
 // java.io.IOException,java.util.NoSuchElementException
 // java.io.IOException,java.lang.IndexOutOfBoundsException
+// ThrowsException.method.T
 // java.io.IOException,java.util.NoSuchElementException
 // java.lang.IndexOutOfBoundsException
 // java.io.IOException
@@ -89,6 +90,8 @@ public class ThrowsException {
     public int foo() throws IOException, IndexOutOfBoundsException{
         return 1;
     }
+
+    <T extends Throwable> void method() throws T {}
 }
 // FILE: a.kt
 class ThrowsKt {