Merge pull request #38625 from hamishknight/trail-and-tuple

Don't apply "Convert to Trailing Closure" to call with multiple trailing closures

Author: hamishknight

lib/IDE/Refactoring.cpp

@@ -3709,7 +3709,7 @@ static CallExpr *findTrailingClosureTarget(
     return nullptr;
   CallExpr *CE = cast<CallExpr>(contexts.back().get<Expr*>());
 
-  if (CE->hasTrailingClosure())
+  if (CE->getUnlabeledTrailingClosureIndex().hasValue())
     // Call expression already has a trailing closure.
     return nullptr;
 

test/refactoring/TrailingClosure/rdar81106400.swift

@@ -0,0 +1,9 @@
+func lottaClosures(x: () -> Void, y: () -> Void, z: () -> Void) {
+  lottaClosures(x: {}) {} z: {}
+}
+// RUN: not %refactor -trailingclosure -source-filename %s -pos=2:3
+
+func singleClosure(x: () -> Void) {
+  singleClosure {}
+}
+// RUN: not %refactor -trailingclosure -source-filename %s -pos=7:3