fix instance filtering for java annotation default value checking

google · May 8, 2024 · 90fd8c7 · 90fd8c7
1 parent d432b52
commit 90fd8c7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/...ysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/java/KSAnnotationJavaImpl.kt b/...ysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/java/KSAnnotationJavaImpl.kt
@@ -27,6 +27,7 @@ import com.intellij.lang.jvm.JvmClassKind
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiAnnotationMemberValue
+import com.intellij.psi.PsiAnnotationMethod
 import com.intellij.psi.PsiArrayInitializerMemberValue
 import com.intellij.psi.PsiArrayType
 import com.intellij.psi.PsiClass
@@ -35,7 +36,6 @@ import com.intellij.psi.PsiLiteralValue
 import com.intellij.psi.PsiPrimitiveType
 import com.intellij.psi.PsiReference
 import com.intellij.psi.PsiType
-import com.intellij.psi.impl.source.PsiAnnotationMethodImpl
 import org.jetbrains.kotlin.analysis.api.annotations.KtNamedAnnotationValue
 import org.jetbrains.kotlin.analysis.api.components.buildClassType
 import org.jetbrains.kotlin.analysis.api.lifetime.KtAlwaysAccessibleLifetimeToken
@@ -93,7 +93,7 @@ class KSAnnotationJavaImpl private constructor(private val psi: PsiAnnotation, o
             (type.classifierSymbol() as KtClassOrObjectSymbol).getMemberScope().getConstructors().singleOrNull()
                 ?.let { symbol ->
                     if (symbol.origin == KtSymbolOrigin.JAVA && symbol.psi != null) {
-                        (symbol.psi as PsiClass).allMethods.filterIsInstance<PsiAnnotationMethodImpl>()
+                        (symbol.psi as PsiClass).allMethods.filterIsInstance<PsiAnnotationMethod>()
                             .mapNotNull { annoMethod ->
                                 annoMethod.defaultValue?.let {
                                     val value = it

diff --git a/kotlin-analysis-api/testData/annotationValue/java.kt b/kotlin-analysis-api/testData/annotationValue/java.kt
@@ -18,6 +18,12 @@
 // WITH_RUNTIME
 // TEST PROCESSOR: AnnotationArgumentProcessor
 // EXPECTED:
+// MyClass: stringParam = 2
+// MyClass: stringParam2 = 1
+// MyClass: stringArrayParam = [3, 5, 7]
+// MyClassInLib: stringParam = 2
+// MyClassInLib: stringParam2 = 1
+// MyClassInLib: stringArrayParam = [3, 5, 7]
 // Str
 // 42
 // Foo

diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/AnnotationArgumentProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/AnnotationArgumentProcessor.kt
@@ -30,9 +30,9 @@ class AnnotationArgumentProcessor : AbstractTestProcessor() {
 
     override fun process(resolver: Resolver): List<KSAnnotated> {
         listOf("MyClass", "MyClassInLib").forEach { clsName ->
-            resolver.getClassDeclarationByName(clsName)!!.let { cls ->
+            resolver.getClassDeclarationByName(clsName)?.let { cls ->
                 cls.annotations.single().arguments.forEach {
-                    println("${clsName}: ${it.name!!.asString()} = ${it.value}")
+                    results.add("$clsName: ${it.name!!.asString()} = ${it.value}")
                 }
             }
         }

diff --git a/test-utils/testData/api/annotationValue_java.kt b/test-utils/testData/api/annotationValue_java.kt
@@ -18,6 +18,12 @@
 // WITH_RUNTIME
 // TEST PROCESSOR: AnnotationArgumentProcessor
 // EXPECTED:
+// MyClass: stringParam = 2
+// MyClass: stringParam2 = 1
+// MyClass: stringArrayParam = [3, 5, 7]
+// MyClassInLib: stringParam = 2
+// MyClassInLib: stringParam2 = 1
+// MyClassInLib: stringArrayParam = [3, 5, 7]
 // Str
 // 42
 // Foo