From 1422cc47947504bc610a0e32984981c157e8d365 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Fri, 19 Dec 2014 13:41:21 +0300
Subject: [PATCH] Minor: replace deprecated function call

---
 .../debugger/evaluate/extractFunctionForDebuggerUtil.kt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt
index 79747826559..318a001a4e9 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt
@@ -198,19 +198,19 @@ private fun addDebugExpressionBeforeContextElement(codeFragment: JetCodeFragment
         }
         contextElement is JetFunctionLiteral -> {
             val block = contextElement.getBodyExpression()!!
-            block.getStatements().first ?: block.getLastChild()
+            block.getStatements().firstOrNull() ?: block.getLastChild()
         }
         contextElement is JetDeclarationWithBody && !contextElement.hasBlockBody()-> {
             wrapInRunFun(contextElement.getBodyExpression()!!)
         }
         contextElement is JetDeclarationWithBody && contextElement.hasBlockBody()-> {
             val block = contextElement.getBodyExpression() as JetBlockExpression
-            block.getStatements().first ?: block.getLastChild()
+            block.getStatements().firstOrNull() ?: block.getLastChild()
         }
         contextElement is JetWhenEntry -> {
             val entryExpression = contextElement.getExpression()
             if (entryExpression is JetBlockExpression) {
-                entryExpression.getStatements().first ?: entryExpression.getLastChild()
+                entryExpression.getStatements().firstOrNull() ?: entryExpression.getLastChild()
             }
             else {
                 wrapInRunFun(entryExpression!!)