fix annotation default class reference value for annotation declared …

…in java source.
google · Jun 14, 2023 · 5ef0d6d · 5ef0d6d
1 parent 6ab92a1
commit 5ef0d6d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.../src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt b/.../src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt
@@ -32,6 +32,7 @@ import com.google.devtools.ksp.symbol.impl.kotlin.getKSTypeCached
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiAnnotationMethod
+import com.intellij.psi.PsiType
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor
@@ -339,7 +340,11 @@ fun ValueParameterDescriptor.getDefaultValue(ownerAnnotation: KSAnnotation): Any
             when (psi.defaultValue) {
                 is PsiAnnotation -> KSAnnotationJavaImpl.getCached(psi.defaultValue as PsiAnnotation)
                 else -> JavaPsiFacade.getInstance(psi.project).constantEvaluationHelper
-                    .computeConstantExpression((psi).defaultValue)
+                    .computeConstantExpression((psi).defaultValue).let {
+                        if (it is PsiType) {
+                            ResolverImpl.instance!!.resolveJavaTypeInAnnotations(it)
+                        } else it
+                    }
             }
         }
         else -> throw IllegalStateException("Unexpected psi ${psi.javaClass}, $ExceptionMessage")

diff --git a/test-utils/testData/api/annotationWithDefaultValues.kt b/test-utils/testData/api/annotationWithDefaultValues.kt
@@ -18,14 +18,14 @@
 // TEST PROCESSOR: AnnotationDefaultValuesProcessor
 // EXPECTED:
 // KotlinAnnotation -> b:default,kClassValue:Array<Array<InnerObj>>,topLevelProp:foo,companionProp:companion
-// JavaAnnotation -> withDefaultValue:OK,nested:@Nested
+// JavaAnnotation -> withDefaultValue:OK,typeVal:HashMap<*, *>,nested:@Nested
 // JavaAnnotation2 -> x:x-default,y:y-default,z:z-default
 // KotlinAnnotation2 -> y:y-default,z:z-default,kotlinEnumVal:VALUE_1
 // KotlinAnnotationLib -> b:defaultInLib,kClassValue:OtherKotlinAnnotation,topLevelProp:bar
 // JavaAnnotationWithDefaults -> stringVal:foo,stringArrayVal:[x, y],typeVal:HashMap<*, *>,typeArrayVal:[LinkedHashMap<*, *>],intVal:3,intArrayVal:[1, 3, 5],enumVal:JavaEnum.DEFAULT,enumArrayVal:[JavaEnum.VAL1, JavaEnum.VAL2],localEnumVal:JavaAnnotationWithDefaults.LocalEnum.LOCAL1,otherAnnotationVal:@OtherAnnotation,otherAnnotationArrayVal:[@OtherAnnotation],kotlinAnnotationLibVal:@OtherKotlinAnnotation
 // KotlinAnnotationWithDefaults -> stringVal:foo,stringArrayVal:[x, y],typeVal:HashMap<*, *>,typeArrayVal:[LinkedHashMap<*, *>],intVal:3,intArrayVal:[1, 3, 5],enumVal:JavaEnum.DEFAULT,enumArrayVal:[JavaEnum.VAL1, JavaEnum.VAL2],otherAnnotationVal:@OtherAnnotation,otherAnnotationArrayVal:[@OtherAnnotation],kotlinAnnotationLibVal:@OtherKotlinAnnotation
 // KotlinAnnotation -> b:default,kClassValue:Array<Array<InnerObj>>,topLevelProp:foo,companionProp:companion
-// JavaAnnotation -> withDefaultValue:OK,nested:@Nested
+// JavaAnnotation -> withDefaultValue:OK,typeVal:HashMap<*, *>,nested:@Nested
 // JavaAnnotation2 -> x:x-default,y:y-default,z:z-default
 // KotlinAnnotation2 -> y:y-default,z:z-default,kotlinEnumVal:VALUE_1
 // END
@@ -128,9 +128,11 @@ enum class KotlinEnum {
 }
 
 // FILE: JavaAnnotation.java
+import java.util.HashMap;
 public @interface JavaAnnotation {
     String debug();
     String withDefaultValue()  default "OK";
+    Class<?> typeVal() default HashMap.class;
     @interface Nested {
         String nestedX() default "nested";
     }