DeprecatedSymbolUsageFix: can drop more arguments when function literal argument exist

idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt

@@ -230,6 +230,9 @@ public abstract class DeprecatedSymbolUsageFixBase(
             // TODO: process introduced variables too
             introduceNamedArguments(result)
 
+            // TODO: process introduced variables too
+            restoreFunctionLiteralArguments(result)
+
             //TODO: do this earlier
             dropArgumentsForDefaultValues(result)
 
@@ -250,9 +253,6 @@ public abstract class DeprecatedSymbolUsageFixBase(
             // TODO: process introduced variables too
             simplifySpreadArrayOfArguments(result)
 
-            // TODO: process introduced variables too
-            restoreFunctionLiteralArguments(result)
-
             // clean up user data
             //TODO: not correct - we do not process introduced declarations before!!!
             result.forEachDescendantOfType<JetExpression> {
@@ -541,6 +541,12 @@ public abstract class DeprecatedSymbolUsageFixBase(
                 argument as JetValueArgument
                 val argumentList = argument.getParent() as JetValueArgumentList
                 argumentList.removeArgument(argument)
+                if (argumentList.getArguments().isEmpty()) {
+                    val callExpression = argumentList.getParent() as JetCallExpression
+                    if (callExpression.getFunctionLiteralArguments().isNotEmpty()) {
+                        argumentList.delete()
+                    }
+                }
             }
         }