Uast: KotlinUNestedAnnotation for processing nested annotations (IDEA-185890)

plugins/uast-kotlin/tests/KotlinUastApiTest.kt

@@ -275,6 +275,23 @@ class KotlinUastApiTest : AbstractKotlinUastTest() {
 
         }
     }
+
+    @Test
+    fun testNestedAnnotation() = doTest("AnnotationComplex") { _, file ->
+        file.findElementByTextFromPsi<UElement>("@AnnotationArray(value = Annotation())")
+            .findElementByTextFromPsi<UElement>("Annotation()")
+            .sourcePsiElement
+            .let { referenceExpression ->
+                val convertedUAnnotation = referenceExpression
+                    .cast<KtReferenceExpression>()
+                    .toUElementOfType<UAnnotation>()
+                        ?: throw AssertionError("haven't got annotation from $referenceExpression(${referenceExpression?.javaClass})")
+
+                assertEquals("Annotation", convertedUAnnotation.qualifiedName)
+            }
+    }
+
+
 }
 
 fun <T, R> Iterable<T>.assertedFind(value: R, transform: (T) -> R): T = find { transform(it) == value } ?: throw AssertionError("'$value' not found, only ${this.joinToString { transform(it).toString() }}")

plugins/uast-kotlin/tests/SimpleKotlinRenderLogTest.kt

@@ -72,4 +72,7 @@ class SimpleKotlinRenderLogTest : AbstractKotlinRenderLogTest() {
 
     @Test
     fun testAnonymous() = doTest("Anonymous")
+
+    @Test
+    fun testAnnotationComplex() = doTest("AnnotationComplex")
 }

plugins/uast-kotlin/tests/org/jetbrains/uast/test/env/AbstractUastTest.kt

@@ -73,7 +73,8 @@ inline fun <reified T : UElement> PsiElement.findUElementByTextFromPsi(refText:
             ?: throw AssertionError("requested text '$refText' was not found in $this")
     val uElementContainingText = elementAtStart.parentsWithSelf.let {
         if (strict) it.dropWhile { !it.text.contains(refText) } else it
-    }.mapNotNull { it.toUElementOfType<T>() }.first()
+    }.mapNotNull { it.toUElementOfType<T>() }.firstOrNull()
+            ?: throw AssertionError("requested text '$refText' not found as '${T::class.java.canonicalName}' in $this")
     if (strict && uElementContainingText.psi != null && uElementContainingText.psi?.text != refText) {
         throw AssertionError("requested text '$refText' found as '${uElementContainingText.psi?.text}' in $uElementContainingText")
     }