azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KtLightAnnotationForSourceEntry fix for reading unnamed java-annotation parameter

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2017-08-28 19:14:35 +03:00
committed by Pavel Talanov
parent e1924e0d2f
commit 108a40261b
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
+1 -1
View File
@@ -107,7 +107,7 @@ class KtLightAnnotationForSourceEntry(
val annotationConstructor = resolvedCall.resultingDescriptor
val parameterName =
memberValue.getNonStrictParentOfType<PsiNameValuePair>()?.name ?:
memberValue.getNonStrictParentOfType<PsiAnnotationMethod>()?.name ?:
memberValue.getNonStrictParentOfType<PsiAnnotationMethod>()?.takeIf { it.containingClass?.isAnnotationType == true }?.name ?:
"value"
val parameter = annotationConstructor.valueParameters.singleOrNull { it.name.asString() == parameterName } ?: return null