Merge pull request #38614 from apple/add-escaping-to-async-tests

[Test] Add @escaping to async refactoring tests

Author: bnbarham

test/SourceKit/Refactoring/basic.swift

@@ -116,7 +116,7 @@ HasInitWithDefaultArgs(y: 45, z: 89)
 func `hasBackticks`(`x`: Int) {}
 `hasBackticks`(`x`:2)
 
-func hasAsyncAlternative(completion: (String?, Error?) -> Void) { }
+func hasAsyncAlternative(completion: @escaping (String?, Error?) -> Void) { }
 func hasCallToAsyncAlternative() {
   hasAsyncAlternative { str, err in print(str!) }
 }

test/refactoring/ConvertAsync/async_attribute_added.swift

@@ -1,3 +1,5 @@
+// REQUIRES: concurrency
+
 // RUN: %empty-directory(%t)
 
 // RUN: %refactor-check-compiles -add-async-alternative -dump-text -source-filename %s -pos=%(line+1):1 -enable-experimental-concurrency | %FileCheck -check-prefix=SIMPLE %s

test/refactoring/ConvertAsync/basic.swift

@@ -1,6 +1,8 @@
+// REQUIRES: concurrency
+
 // RUN: %empty-directory(%t)
 
-func simple(completion: () -> Void) { }
+func simple(completion: @escaping () -> Void) { }
 func anything() -> Bool { return true }
 
 // RUN: %swift-frontend -typecheck %s

test/refactoring/ConvertAsync/check_compiles.swift

@@ -1,12 +1,14 @@
+// REQUIRES: concurrency
+
 // RUN: %empty-directory(%t)
 
-func simple(_ completion: (String) -> Void) { }
+func simple(_ completion: @escaping (String) -> Void) { }
 func simple() async -> String { }
 
-func simpleArg(arg: String, _ completion: (String) -> Void) { }
+func simpleArg(arg: String, _ completion: @escaping (String) -> Void) { }
 func simpleArg(arg: String) async -> String { }
 
-func simpleErr(arg: String, _ completion: (String?, Error?) -> Void) { }
+func simpleErr(arg: String, _ completion: @escaping (String?, Error?) -> Void) { }
 func simpleErr(arg: String) async throws -> String { }
 
 func whatever() -> Bool { return true }

test/refactoring/ConvertAsync/convert_async_renames.swift

@@ -1,3 +1,5 @@
+// REQUIRES: concurrency
+
 // RUN: %empty-directory(%t)
 
 enum CustomError : Error {

test/refactoring/ConvertAsync/convert_async_wrapper.swift

@@ -7,9 +7,9 @@
 import Foundation
 import ConvertBoolObjC
 
-func boolWithErr(completion: (Bool, Error?) -> Void) {}
-func multipleBoolWithErr(completion: (String?, Bool, Bool, Error?) -> Void) {}
-func optionalBoolWithErr(completion: (String?, Bool?, Bool, Error?) -> Void) {}
+func boolWithErr(completion: @escaping (Bool, Error?) -> Void) {}
+func multipleBoolWithErr(completion: @escaping (String?, Bool, Bool, Error?) -> Void) {}
+func optionalBoolWithErr(completion: @escaping (String?, Bool?, Bool, Error?) -> Void) {}
 
 // All 7 of the below should generate the same refactoring.
 
@@ -185,7 +185,7 @@ boolWithErr { success, err in
     }
   }
   if !success {
-    for x: Int in [] {
+    for _: Int in [] {
       fatalError("oh no \(err!)")
     }
   }
@@ -212,7 +212,7 @@ boolWithErr { success, err in
 // BOOL-DONT-HANDLE2-NEXT:   }
 // BOOL-DONT-HANDLE2-NEXT: }
 // BOOL-DONT-HANDLE2-NEXT: if !success {
-// BOOL-DONT-HANDLE2-NEXT:   for x: Int in [] {
+// BOOL-DONT-HANDLE2-NEXT:   for _: Int in [] {
 // BOOL-DONT-HANDLE2-NEXT:     fatalError("oh no \(<#err#>!)")
 // BOOL-DONT-HANDLE2-NEXT:   }
 // BOOL-DONT-HANDLE2-NEXT: }
@@ -221,7 +221,7 @@ boolWithErr { success, err in
 // RUN: %refactor -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+1):1 -I %S/Inputs -I %t %clang-importer-sdk-nosource | %FileCheck -check-prefix=BOOL-DONT-HANDLE3 %s
 boolWithErr { success, err in
   if !success {
-    fatalError("oh no maybe \(err)")
+    fatalError("oh no maybe \(String(describing: err))")
   }
   print("not err")
 }
@@ -230,7 +230,7 @@ boolWithErr { success, err in
 
 // BOOL-DONT-HANDLE3:      let success = try await boolWithErr()
 // BOOL-DONT-HANDLE3-NEXT: if !success {
-// BOOL-DONT-HANDLE3-NEXT:   fatalError("oh no maybe \(<#err#>)")
+// BOOL-DONT-HANDLE3-NEXT:   fatalError("oh no maybe \(String(describing: <#err#>))")
 // BOOL-DONT-HANDLE3-NEXT: }
 // BOOL-DONT-HANDLE3-NEXT: print("not err")
 
@@ -342,7 +342,7 @@ optionalBoolWithErr { str, optBool, b, err in
     print("d \(err!)")
   }
   if optBool == false {
-    print("e \(err)")
+    print("e \(String(describing: err))")
   }
   if optBool != true {
     print("f \(err!)")
@@ -360,7 +360,7 @@ optionalBoolWithErr { str, optBool, b, err in
 // OPT-BOOL-WITH-ERR-NEXT:   let (str, optBool, b) = try await optionalBoolWithErr()
 // OPT-BOOL-WITH-ERR-NEXT:   print("a \(<#err#>!)")
 // OPT-BOOL-WITH-ERR-NEXT:   if <#optBool#> == false {
-// OPT-BOOL-WITH-ERR-NEXT:     print("e \(<#err#>)")
+// OPT-BOOL-WITH-ERR-NEXT:     print("e \(String(describing: <#err#>))")
 // OPT-BOOL-WITH-ERR-NEXT:   }
 // OPT-BOOL-WITH-ERR-NEXT:   if <#optBool#> != true {
 // OPT-BOOL-WITH-ERR-NEXT:     print("f \(<#err#>!)")
@@ -426,7 +426,7 @@ ClassWithHandlerMethods.secondBoolFlagFailure("") { str, unrelated, failure, err
   if failure && err != nil {
     print("neat")
   }
-  if failure, let err = err {
+  if failure, let _ = err {
     print("neato")
   }
 }