Fix OperatorToFunctionIntention: insert function literal expressions to arguments correctly

idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt

@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.idea.util.CommentSaver
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector
+import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.util.OperatorNameConventions
@@ -199,9 +200,15 @@ public class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(
             val funcLitArgs = element.getLambdaArguments()
             val calleeText = callee.getText()
             val transformation = "$calleeText.${OperatorNameConventions.INVOKE.asString()}" +
-                                 (if (argumentString == null) "" else "($argumentString)")
+                                 (if (argumentString == null) "()" else "($argumentString)")
             val transformed = KtPsiFactory(element).createExpression(transformation)
-            funcLitArgs.forEach { transformed.add(it) }
+            val callExpression = transformed.getCalleeExpressionIfAny()?.parent as? KtCallExpression
+            if (callExpression != null) {
+                funcLitArgs.forEach { callExpression.add(it) }
+                if (argumentString == null) {
+                    callExpression.valueArgumentList?.delete()
+                }
+            }
             return callee.getParent()!!.replace(transformed) as KtExpression
         }
 

idea/testData/intentions/operatorToFunction/functionCallWithMultipleArgumentsAndSingleLambda.kt.after

@@ -4,5 +4,5 @@ class Mocha() {
 }
 fun main() {
     val mocha = Mocha()
-    val testing = mocha.invoke(1, "fire"){ x: Int -> "hello world" }
+    val testing = mocha.invoke(1, "fire") { x: Int -> "hello world" }
 }

idea/testData/intentions/operatorToFunction/functionCallWithSingleLambda.kt.after

@@ -3,5 +3,5 @@ class Mocha() {
 }
 fun main() {
     val mocha = Mocha()
-    val testing = mocha.invoke{ x: Int -> "hello world" }
+    val testing = mocha.invoke { x: Int -> "hello world" }
 }