Merge pull request #17291 from rintaro/refactoring-trailingclosure-tupleshuffle

[Refactoring] Handle TupleShuffleExpr in "convert to trailing closure" action

Author: rintaro

lib/IDE/Refactoring.cpp

@@ -2775,7 +2775,7 @@ bool RefactoringActionTrailingClosure::performChange() {
     return true;
   Expr *Args = CE->getArg();
   if (auto *TSE = dyn_cast<TupleShuffleExpr>(Args))
-    Args = TSE;
+    Args = TSE->getSubExpr();
 
   Expr *ClosureArg = nullptr;
   Expr *PrevArg = nullptr;

test/refactoring/TrailingClosure/Outputs/basic/L10.swift.expected

@@ -14,6 +14,10 @@ func testTrailingClosure() -> String {
     .map({ $0 + 1 })
 }
 
+func foobar(first: String? = nil, closure: () -> Void) { fatalError() }
+func blah() {
+  _ = foobar(closure: { print("foo") })
+}
 
 
 

test/refactoring/TrailingClosure/Outputs/basic/L13.swift.expected

@@ -14,6 +14,10 @@ func testTrailingClosure() -> String {
     .map({ $0 + 1 })
 }
 
+func foobar(first: String? = nil, closure: () -> Void) { fatalError() }
+func blah() {
+  _ = foobar(closure: { print("foo") })
+}
 
 
 

test/refactoring/TrailingClosure/Outputs/basic/L14.swift.expected

@@ -14,6 +14,10 @@ func testTrailingClosure() -> String {
     .map { $0 + 1 }
 }
 
+func foobar(first: String? = nil, closure: () -> Void) { fatalError() }
+func blah() {
+  _ = foobar(closure: { print("foo") })
+}
 
 
 

test/refactoring/TrailingClosure/Outputs/basic/L19.swift.expected

@@ -0,0 +1,25 @@
+struct Foo {
+  static func foo(a: () -> Int) {}
+  func qux(x: Int, y: () -> Int ) {}
+}
+
+func testTrailingClosure() -> String {
+  Foo.foo(a: { 1 })
+  Foo.bar(a: { print(3); return 1 })
+  Foo().qux(x: 1, y: { 1 })
+  let _ = Foo().quux(x: 1, y: { 1 })
+
+  [1,2,3]
+    .filter({ $0 % 2 == 0 })
+    .map({ $0 + 1 })
+}
+
+func foobar(first: String? = nil, closure: () -> Void) { fatalError() }
+func blah() {
+  _ = foobar { print("foo") }
+}
+
+
+
+
+

test/refactoring/TrailingClosure/Outputs/basic/L7.swift.expected

@@ -14,6 +14,10 @@ func testTrailingClosure() -> String {
     .map({ $0 + 1 })
 }
 
+func foobar(first: String? = nil, closure: () -> Void) { fatalError() }
+func blah() {
+  _ = foobar(closure: { print("foo") })
+}
 
 
 

test/refactoring/TrailingClosure/Outputs/basic/L8.swift.expected

@@ -14,6 +14,10 @@ func testTrailingClosure() -> String {
     .map({ $0 + 1 })
 }
 
+func foobar(first: String? = nil, closure: () -> Void) { fatalError() }
+func blah() {
+  _ = foobar(closure: { print("foo") })
+}
 
 
 

test/refactoring/TrailingClosure/Outputs/basic/L9.swift.expected

@@ -14,6 +14,10 @@ func testTrailingClosure() -> String {
     .map({ $0 + 1 })
 }
 
+func foobar(first: String? = nil, closure: () -> Void) { fatalError() }
+func blah() {
+  _ = foobar(closure: { print("foo") })
+}
 
 
 

test/refactoring/TrailingClosure/basic.swift

@@ -13,6 +13,11 @@ func testTrailingClosure() -> String {
     .filter({ $0 % 2 == 0 })
     .map({ $0 + 1 })
 }
+
+func foobar(first: String? = nil, closure: () -> Void) { fatalError() }
+func blah() {
+  _ = foobar(closure: { print("foo") })
+}
 // RUN: %empty-directory(%t.result)
 
 // RUN: %refactor -trailingclosure -source-filename %s -pos=7:3 > %t.result/L7.swift
@@ -31,4 +36,5 @@ func testTrailingClosure() -> String {
 // RUN: diff -u %S/Outputs/basic/L13.swift.expected %t.result/L13.swift
 // RUN: %refactor -trailingclosure -source-filename %s -pos=14:5 > %t.result/L14.swift
 // RUN: diff -u %S/Outputs/basic/L14.swift.expected %t.result/L14.swift
-
+// RUN: %refactor -trailingclosure -source-filename %s -pos=19:7 > %t.result/L19.swift
+// RUN: diff -u %S/Outputs/basic/L19.swift.expected %t.result/L19.swift