Test defaults in nested annotation

kuanyingchou · Sep 2, 2024 · 28add76 · 28add76
1 parent 6af7077
commit 28add76
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 12 deletions.
diff --git a/kotlin-analysis-api/testData/annotationValue/annotationValue_java.kt b/kotlin-analysis-api/testData/annotationValue/annotationValue_java.kt
@@ -39,7 +39,10 @@
 // 31
 // [warning1, warning 2]
 // Sub: [i:42]
-// TestJavaLib: OtherAnnotation
+// TestNestedAnnotationDefaults: def
+// TestNestedAnnotationDefaults: hij
+// TestNestedAnnotationDefaults: def
+// TestNestedAnnotationDefaults: hij
 // END
 // MODULE: module1
 // FILE: placeholder.kt
@@ -73,6 +76,9 @@ public @interface JavaAnnotationWithDefaults {
     OtherAnnotation otherAnnotationVal() default @OtherAnnotation("def");
 }
 
+// FILE: KotlinAnnotationWithDefaults.kt
+annotation class KotlinAnnotationWithDefaults(val otherAnnotation: OtherAnnotation = OtherAnnotation("hij"))
+
 // MODULE: main(module1)
 // FILE: Test.java
 @MyAnnotation(stringParam = "2") class MyClass implements MyInterface {}
@@ -136,6 +142,17 @@ import java.lang.annotation.Target;
 interface Parent {}
 class Sub implements @B(a = @A(i = 42)) Parent {}
 
-// FILE: TestJavaLib.java
+// FILE: JavaAnnotationWithDefaultsInSource.java
+public @interface JavaAnnotationWithDefaultsInSource {
+    OtherAnnotation otherAnnotationVal() default @OtherAnnotation("def");
+}
+
+// FILE: KotlinAnnotationWithDefaults.kt
+annotation class KotlinAnnotationWithDefaultsInSource(val otherAnnotation: OtherAnnotation = OtherAnnotation("hij"))
+
+// FILE: TestNestedAnnotationDefaults.java
+@JavaAnnotationWithDefaultsInSource
+@KotlinAnnotationWithDefaultsInSource
 @JavaAnnotationWithDefaults
-class TestJavaLib {}
+@KotlinAnnotationWithDefaults
+class TestNestedAnnotationDefaults {}
diff --git a/kotlin-analysis-api/testData/annotationValue/annotationValue_kt.kt b/kotlin-analysis-api/testData/annotationValue/annotationValue_kt.kt
@@ -41,7 +41,10 @@
 // Sub: [i:42]
 // Cls: argToA: b
 // Cls: argToB: 42
-// TestJavaLib: OtherAnnotation
+// TestNestedAnnotationDefaults: def
+// TestNestedAnnotationDefaults: hij
+// TestNestedAnnotationDefaults: def
+// TestNestedAnnotationDefaults: hij
 // END
 // MODULE: module1
 // FILE: placeholder.kt
@@ -72,6 +75,9 @@ public @interface JavaAnnotationWithDefaults {
     OtherAnnotation otherAnnotationVal() default @OtherAnnotation("def");
 }
 
+// FILE: KotlinAnnotationWithDefaults.kt
+annotation class KotlinAnnotationWithDefaults(val otherAnnotation: OtherAnnotation = OtherAnnotation("hij"))
+
 // MODULE: main(module1)
 // FILE: a.kt
 
@@ -147,6 +153,17 @@ interface Parent
 
 class Sub : @B(a = A(i = 42)) Parent
 
-// FILE: TestJavaLib.kt
+// FILE: JavaAnnotationWithDefaultsInSource.java
+public @interface JavaAnnotationWithDefaultsInSource {
+    OtherAnnotation otherAnnotationVal() default @OtherAnnotation("def");
+}
+
+// FILE: KotlinAnnotationWithDefaults.kt
+annotation class KotlinAnnotationWithDefaultsInSource(val otherAnnotation: OtherAnnotation = OtherAnnotation("hij"))
+
+// FILE: KotlinClient.kt
+@JavaAnnotationWithDefaultsInSource
+@KotlinAnnotationWithDefaultsInSource
 @JavaAnnotationWithDefaults
-class TestJavaLib
+@KotlinAnnotationWithDefaults
+class TestNestedAnnotationDefaults
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
@@ -79,9 +79,10 @@ class AnnotationArgumentProcessor : AbstractTestProcessor() {
             }
         }
 
-        resolver.getClassDeclarationByName("TestJavaLib")?.let { cls ->
-            cls.annotations.single().arguments.single().let { ksValueArg ->
-                results.add("TestJavaLib: " + (ksValueArg.value as KSAnnotation).shortName.asString())
+        resolver.getClassDeclarationByName("TestNestedAnnotationDefaults")?.let { cls ->
+            cls.annotations.forEach { annotation ->
+                val annotationArg = annotation.arguments.single().value as KSAnnotation
+                results.add("${cls.simpleName.asString()}: ${annotationArg.arguments.single().value}")
             }
         }
 

diff --git a/test-utils/testData/api/annotationValue_java.kt b/test-utils/testData/api/annotationValue_java.kt
@@ -37,7 +37,10 @@
 // 31
 // [warning1, warning 2]
 // Sub: [i:42]
-// TestJavaLib: OtherAnnotation
+// TestNestedAnnotationDefaults: def
+// TestNestedAnnotationDefaults: hij
+// TestNestedAnnotationDefaults: def
+// TestNestedAnnotationDefaults: hij
 // END
 // MODULE: module1
 // FILE: placeholder.kt
@@ -65,6 +68,9 @@ public @interface JavaAnnotationWithDefaults {
     OtherAnnotation otherAnnotationVal() default @OtherAnnotation("def");
 }
 
+// FILE: KotlinAnnotationWithDefaults.kt
+annotation class KotlinAnnotationWithDefaults(val otherAnnotation: OtherAnnotation = OtherAnnotation("hij"))
+
 // MODULE: main(module1)
 // FILE: Test.java
 @MyAnnotation(stringParam = "2") class MyClass implements MyInterface {}
@@ -127,6 +133,17 @@ import java.lang.annotation.Target;
 interface Parent {}
 class Sub implements @B(a = @A(i = 42)) Parent {}
 
-// FILE: TestJavaLib.java
+// FILE: JavaAnnotationWithDefaultsInSource.java
+public @interface JavaAnnotationWithDefaultsInSource {
+    OtherAnnotation otherAnnotationVal() default @OtherAnnotation("def");
+}
+
+// FILE: KotlinAnnotationWithDefaults.kt
+annotation class KotlinAnnotationWithDefaultsInSource(val otherAnnotation: OtherAnnotation = OtherAnnotation("hij"))
+
+// FILE: TestNestedAnnotationDefaults.java
+@JavaAnnotationWithDefaultsInSource
+@KotlinAnnotationWithDefaultsInSource
 @JavaAnnotationWithDefaults
-class TestJavaLib {}
+@KotlinAnnotationWithDefaults
+class TestNestedAnnotationDefaults {}
diff --git a/test-utils/testData/api/annotationValue_kt.kt b/test-utils/testData/api/annotationValue_kt.kt
@@ -34,6 +34,10 @@
 // ONE
 // 31
 // Throws
+// TestNestedAnnotationDefaults: def
+// TestNestedAnnotationDefaults: hij
+// TestNestedAnnotationDefaults: def
+// TestNestedAnnotationDefaults: hij
 // END
 // MODULE: module1
 // FILE: placeholder.kt
@@ -49,6 +53,10 @@ public @interface JavaAnnotationWithDefaults {
     OtherAnnotation otherAnnotationVal() default @OtherAnnotation("def");
 }
 
+// FILE: KotlinAnnotationWithDefaults.kt
+annotation class KotlinAnnotationWithDefaults(val otherAnnotation: OtherAnnotation = OtherAnnotation("hij"))
+
+
 // MODULE: main(module1)
 // FILE: a.kt
 
@@ -109,3 +117,19 @@ fun Fun() {
 // FILE: JavaEnum.java
 
 enum JavaEnum { ONE, TWO, THREE }
+
+// FILE: JavaAnnotationWithDefaultsInSource.java
+public @interface JavaAnnotationWithDefaultsInSource {
+    OtherAnnotation otherAnnotationVal() default @OtherAnnotation("def");
+}
+
+// FILE: KotlinAnnotationWithDefaults.kt
+annotation class KotlinAnnotationWithDefaultsInSource(val otherAnnotation: OtherAnnotation = OtherAnnotation("hij"))
+
+// FILE: KotlinClient.kt
+@JavaAnnotationWithDefaultsInSource
+@KotlinAnnotationWithDefaultsInSource
+@JavaAnnotationWithDefaults
+@KotlinAnnotationWithDefaults
+class TestNestedAnnotationDefaults
+