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

Fix KNPE in evaluator (EA-89384)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-09-19 23:41:43 +03:00
parent 8c7f469030
commit 58571dcf1d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+10 -3
View File
@@ -289,12 +289,19 @@ private fun findElementBefore(contextElement: PsiElement): PsiElement? {
wrapInLambdaCall(delegateExpressionOrInitializer) wrapInLambdaCall(delegateExpressionOrInitializer)
} }
else { else {
val getter = contextElement.getter!! val getter = contextElement.getter
val bodyExpression = getter?.bodyExpression
if (getter != null && bodyExpression != null) {
if (!getter.hasBlockBody()) { if (!getter.hasBlockBody()) {
wrapInLambdaCall(getter.bodyExpression!!) wrapInLambdaCall(bodyExpression)
} }
else { else {
(getter.bodyExpression as KtBlockExpression).statements.first() (bodyExpression as KtBlockExpression).statements.first()
}
}
else {
contextElement
} }
} }
} }