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

KtLightAnnotationForSourceEntry: varargs handling improved (KT-21335, EA-107118)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2017-11-22 11:49:18 +03:00
committed by xiexed
parent 23344783a5
commit 07601b2ec4
2 changed files with 97 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
+9 -2
View File
@@ -139,8 +139,14 @@ class KtLightAnnotationForSourceEntry(
is VarargValueArgument ->
memberValue.unwrapArray(resolvedArgument.arguments)
?: resolvedArgument.arguments.first().asElement().parent.parent.let {
it.asKtCall() ?: it
?: resolvedArgument.arguments.first().asElement().let {
(it as? KtValueArgument)
?.takeIf {
it.getSpreadElement() != null ||
it.getArgumentName() != null ||
it.getArgumentExpression() is KtCollectionLiteralExpression
}
?.getArgumentExpression() ?: it.parent
}
else -> error("resolvedArgument: ${resolvedArgument.javaClass} cant be processed")
@@ -189,6 +195,7 @@ class KtLightAnnotationForSourceEntry(
wrapAnnotationValue(memberValue, this, {
originalExpression.let { ktOrigin ->
when (ktOrigin) {
is KtValueArgumentList -> ktOrigin.arguments.getOrNull(i)?.getArgumentExpression()
is KtCallElement -> ktOrigin.valueArguments.getOrNull(i)?.getArgumentExpression()
is KtCollectionLiteralExpression -> ktOrigin.getInnerExpressions().getOrNull(i)
else -> null