include synthetic accessors for checked exception

google · Jun 13, 2024 · ee4ff8b · ee4ff8b
1 parent 00862a1
commit ee4ff8b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
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
@@ -428,7 +428,7 @@ class ResolverAAImpl(
 
     override fun getJvmCheckedException(accessor: KSPropertyAccessor): Sequence<KSType> {
         return when (accessor.origin) {
-            Origin.KOTLIN -> {
+            Origin.KOTLIN, Origin.SYNTHETIC -> {
                 extractThrowsAnnotation(accessor)
             }
             Origin.KOTLIN_LIB, Origin.JAVA_LIB -> {

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
@@ -48,6 +48,12 @@ class ThrowListProcessor : AbstractTestProcessor() {
         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())
+        klass.declarations.filter { it.simpleName.asString() == "syntheticAccessors" }.map {
+            resolver.getJvmCheckedException((it as KSPropertyDeclaration).getter!!).toResult()
+        }.sorted().forEach { result.add(it) }
+        klass.declarations.filter { it.simpleName.asString() == "syntheticAccessors" }.map {
+            resolver.getJvmCheckedException((it as KSPropertyDeclaration).setter!!).toResult()
+        }.sorted().forEach { result.add(it) }
         val jlib = resolver.getClassDeclarationByName("JavaLib")!!
         val klib = resolver.getClassDeclarationByName("KtLib")!!
         klib.declarations.filter { it.simpleName.asString() == "throwsLibKt" }.map {
@@ -65,6 +71,12 @@ class ThrowListProcessor : AbstractTestProcessor() {
         klib.declarations.filter { it.simpleName.asString() == "bothThrows" }.map {
             resolver.getJvmCheckedException((it as KSPropertyDeclaration).setter!!).toResult()
         }.sorted().forEach { result.add(it) }
+        klib.declarations.filter { it.simpleName.asString() == "syntheticAccessors" }.map {
+            resolver.getJvmCheckedException((it as KSPropertyDeclaration).getter!!).toResult()
+        }.sorted().forEach { result.add(it) }
+        klib.declarations.filter { it.simpleName.asString() == "syntheticAccessors" }.map {
+            resolver.getJvmCheckedException((it as KSPropertyDeclaration).setter!!).toResult()
+        }.sorted().forEach { result.add(it) }
         jlib.declarations.filter { it.simpleName.asString() == "foo" }.map {
             resolver.getJvmCheckedException(it as KSFunctionDeclaration).toResult()
         }.sorted().forEach { result.add(it) }

diff --git a/test-utils/testData/api/throwList.kt b/test-utils/testData/api/throwList.kt
@@ -23,13 +23,17 @@
 // ThrowsException.method.T
 // java.io.IOException,java.util.NoSuchElementException
 // java.lang.IndexOutOfBoundsException
+// java.util.NoSuchElementException
+// java.lang.IndexOutOfBoundsException
 // java.io.IOException
 // java.io.IOException,java.lang.IndexOutOfBoundsException
 // java.lang.IndexOutOfBoundsException
 // java.lang.IllegalArgumentException
 // java.lang.IllegalStateException
 // java.io.IOException
 // java.lang.IllegalStateException,java.lang.IllegalArgumentException
+// java.util.NoSuchElementException
+// java.lang.IndexOutOfBoundsException
 // java.io.IOException
 // java.io.IOException,java.lang.IndexOutOfBoundsException
 // java.lang.IndexOutOfBoundsException
@@ -80,6 +84,10 @@ class KtLib {
     @get:Throws(IOException::class)
     @set:Throws(IllegalStateException::class, IllegalArgumentException::class)
     var bothThrows: Int = 3
+
+    @set:Throws(java.lang.IndexOutOfBoundsException::class)
+    @get:Throws(java.util.NoSuchElementException::class)
+    var syntheticAccessors: Int = 0
 }
 // MODULE: main(lib)
 // FILE: ThrowsException.java
@@ -107,4 +115,8 @@ class ThrowsKt {
     set(a: Int) {
 
     }
+
+    @set:Throws(java.lang.IndexOutOfBoundsException::class)
+    @get:Throws(java.util.NoSuchElementException::class)
+    var syntheticAccessors: Int
 }