From 58571dcf1d882cf9907f64e3995d7dcb62376c3e Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <Yan.Zhulanow@jetbrains.com>
Date: Tue, 19 Sep 2017 23:41:43 +0300
Subject: [PATCH] Fix KNPE in evaluator (EA-89384)

---
 .../evaluate/extractFunctionForDebuggerUtil.kt    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
index 45166a2b474..a67a62bbcd0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
@@ -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
                 }
             }
         }