From 45428895adef92d1e23d920bc1b6dd65c2bd8255 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 16 Apr 2015 14:25:55 +0300
Subject: [PATCH] Change Signature: Always put last lambda argument outside of
 value argument list

---
 .../changeSignature/usages/JetFunctionCallUsage.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java
index b420e0ad97f..15b3a3fb242 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java
@@ -168,8 +168,7 @@ public class JetFunctionCallUsage extends JetUsageInfo<JetCallElement> {
         }
 
         List<JetFunctionLiteralArgument> lambdaArguments = element.getFunctionLiteralArguments();
-        boolean hasLambdaArgumentsBefore = !lambdaArguments.isEmpty();
-        if (hasLambdaArgumentsBefore) {
+        if (!lambdaArguments.isEmpty()) {
             element.deleteChildRange(KotlinPackage.first(lambdaArguments), KotlinPackage.last(lambdaArguments));
         }
 
@@ -197,7 +196,7 @@ public class JetFunctionCallUsage extends JetUsageInfo<JetCallElement> {
             newElement = (JetElement) elementToReplace.replace(replacingElement);
         }
 
-        if (hasLambdaArgumentsBefore && hasTrailingLambdaInArgumentListAfter) {
+        if (hasTrailingLambdaInArgumentListAfter) {
             JetCallElement newCallElement =
                     (JetCallElement) (newElement instanceof JetQualifiedExpression
                                       ? ((JetQualifiedExpression) newElement).getSelectorExpression()