Change Signature: Always put last lambda argument outside of value ar…

…gument list
JetBrains · Apr 17, 2015 · 4542889 · 4542889
1 parent daebf56
commit 4542889
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...rc/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java b/...rc/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java
@@ -168,8 +168,7 @@ else if (parameterInfo.getDefaultValueForCall().isEmpty()) {
         }
 
         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 @@ else if (parameterInfo.getDefaultValueForCall().isEmpty()) {
             newElement = (JetElement) elementToReplace.replace(replacingElement);
         }
 
-        if (hasLambdaArgumentsBefore && hasTrailingLambdaInArgumentListAfter) {
+        if (hasTrailingLambdaInArgumentListAfter) {
             JetCallElement newCallElement =
                     (JetCallElement) (newElement instanceof JetQualifiedExpression
                                       ? ((JetQualifiedExpression) newElement).getSelectorExpression()