Fix KNPE in evaluator (EA-89384)

2017-09-19 23:41:43 +03:00
parent 8c7f469030
commit 58571dcf1d
1 changed files with 11 additions and 4 deletions
@@ -289,12 +289,19 @@ private fun findElementBefore(contextElement: PsiElement): PsiElement? {
                wrapInLambdaCall(delegateExpressionOrInitializer)
            }
            else {
-                val getter = contextElement.getter!!
-                if (!getter.hasBlockBody()) {
-                    wrapInLambdaCall(getter.bodyExpression!!)
+                val getter = contextElement.getter
+                val bodyExpression = getter?.bodyExpression
+
+                if (getter != null && bodyExpression != null) {
+                    if (!getter.hasBlockBody()) {
+                        wrapInLambdaCall(bodyExpression)
+                    }
+                    else {
+                        (bodyExpression as KtBlockExpression).statements.first()
+                    }
                }
                else {
-                    (getter.bodyExpression as KtBlockExpression).statements.first()
+                    contextElement
                }
            }
        }