From 1c2082fd198e9474d6bda9fcd2b2efe4a945edf4 Mon Sep 17 00:00:00 2001
From: Tal Man <tman@andrew.cmu.edu>
Date: Tue, 18 Mar 2014 20:53:48 -0400
Subject: [PATCH] Don't create empty parentheses when lambda is the only
 argument

---
 .../intentions/MoveLambdaOutsideParenthesesIntention.kt  | 9 +++++++--
 .../moveLambdaOutsideParentheses/moveLambda3.kt.after    | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt
index c4b8cac1bec..fa68c9d4351 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt
@@ -34,7 +34,12 @@ public class MoveLambdaOutsideParenthesesIntention : JetSelfTargetingIntention<J
         val literal = args.last!!.getArgumentExpression()?.getText() // we know args.last is non null
         val callText = element.getText()
         if (callText == null || literal == null) return
-        val endIndex = Math.max(callText.lastIndexOf(","), callText.indexOf("(") + 1) // in case of single parameter
-        element.replace(JetPsiFactory.createExpression(element.getProject(), "${callText.substring(0,endIndex)})$literal"))
+        val endIndex = callText.lastIndexOf(",")
+        val newCall = if (endIndex > 0) {
+            "${callText.substring(0, endIndex)}) $literal"
+        } else {
+            "${callText.substring(0, callText.indexOf("("))} $literal"
+        }
+        element.replace(JetPsiFactory.createExpression(element.getProject(), newCall))
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt.after b/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt.after
index 1400b53367b..b1a3f428743 100644
--- a/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt.after
+++ b/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt.after
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: true
 fun foo() {
-    bar() { it }
+    bar { it }
 }
 
 fun bar(a: Int, b: Int->Int) {