From fe41c4513fa2a57f705de48a76bd105b20ad0c55 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Wed, 15 Sep 2021 16:18:39 -0700 Subject: [PATCH] LC: weaken condition to lookup nested annotation FIR LC has a different abstraction, so using the specific class name is literally too specific to FE 1.0 LC. We could introduce a common interface for those, but checking `kotlinOrigin` is good enough, and thus type-checking their common ancestor is good enough too. --- .../src/org/jetbrains/kotlin/asJava/lightClassUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt index 88f5f03acde..e96cf4c9f82 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt @@ -177,7 +177,7 @@ fun KtElement.toLightAnnotation(): PsiAnnotation? { if (lightElement !is PsiModifierListOwner) continue for (rootAnnotation in lightElement.modifierList?.annotations ?: continue) { for (annotation in rootAnnotation.withNestedAnnotations()) { - if (annotation is KtLightAnnotationForSourceEntry && annotation.kotlinOrigin == this) + if (annotation is KtLightElement<*, *> && annotation.kotlinOrigin == this) return annotation } }