From 96846d0b52f80e7999a2e563017a0795645e7fe5 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 21 Mar 2017 19:01:38 +0300
Subject: [PATCH] Minor: style fix in KotlinInlineFunctionHandler

---
 .../refactoring/inline/KotlinInlineFunctionHandler.kt     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
index 878ee67e318..ef089ca0775 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
@@ -85,12 +85,8 @@ class KotlinInlineFunctionHandler: InlineActionHandler() {
                 return
             }
 
-            if (lastReturn != null) {
-                replacementBuilder.prepareCodeToInline(lastReturn.returnedExpression, statements.dropLast(1), ::analyzeBodyCopy)
-            }
-            else {
-                replacementBuilder.prepareCodeToInline(null, statements, ::analyzeBodyCopy)
-            }
+            replacementBuilder.prepareCodeToInline(lastReturn?.returnedExpression,
+                                                   statements.dropLast(returnStatements.size), ::analyzeBodyCopy)
         }
         else {
             replacementBuilder.prepareCodeToInline(bodyCopy, emptyList(), ::analyzeBodyCopy)