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

KotlinUastLanguagePlugin#convertElementWithParent NPE fix when parent is null (#1247)

Browse Source
This commit is contained in:
xiexed
2017-08-16 17:47:40 +03:00
committed by Dmitry Jemerov
parent a2a018eadb
commit 12eb4ef37a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt
+2 -2
View File
@@ -74,8 +74,8 @@ class KotlinUastLanguagePlugin : UastLanguagePlugin {
val parentUnwrapped = KotlinConverter.unwrapElements(parent) ?: return null val parentUnwrapped = KotlinConverter.unwrapElements(parent) ?: return null
if (parent is KtValueArgument && parentUnwrapped is KtAnnotationEntry) { if (parent is KtValueArgument && parentUnwrapped is KtAnnotationEntry) {
val argumentName = parent.getArgumentName()?.asName?.asString() ?: "" val argumentName = parent.getArgumentName()?.asName?.asString() ?: ""
return (convertElementWithParent(parentUnwrapped, null) as UAnnotation) return (convertElementWithParent(parentUnwrapped, null) as? UAnnotation)
.attributeValues.find { it.name == argumentName } ?.attributeValues?.find { it.name == argumentName }
} }
else else
return convertElementWithParent(parentUnwrapped, null) return convertElementWithParent(parentUnwrapped, null)