[Concurrency] Introduce more completion-handler names to the import heuristics.

Extend the set of completion-handler names we look for to infer an
`async` import of an Objective-C method, which includes:

* (with)CompletionBlock
* (with)reply
* (with)replyTo

both as parameter names and as base name suffixes.

Author: DougGregor

lib/Basic/StringExtras.cpp

@@ -1392,5 +1392,17 @@ Optional<StringRef> swift::stripWithCompletionHandlerSuffix(StringRef name) {
     return name.drop_back(strlen("WithCompletion"));
   }
 
+  if (name.endswith("WithCompletionBlock")) {
+    return name.drop_back(strlen("WithCompletionBlock"));
+  }
+
+  if (name.endswith("WithReplyTo")) {
+    return name.drop_back(strlen("WithReplyTo"));
+  }
+
+  if (name.endswith("WithReply")) {
+    return name.drop_back(strlen("WithReply"));
+  }
+
   return None;
 }

lib/ClangImporter/ImportName.cpp

@@ -1135,8 +1135,12 @@ Optional<ForeignErrorConvention::Info> NameImporter::considerErrorImport(
 
 /// Whether the given parameter name identifies a completion handler.
 static bool isCompletionHandlerParamName(StringRef paramName) {
-  return paramName == "completionHandler" || paramName == "completion" ||
-      paramName == "withCompletionHandler" || paramName == "withCompletion";
+  return paramName == "completionHandler" ||
+      paramName == "withCompletionHandler" ||
+      paramName == "completion" || paramName == "withCompletion" ||
+      paramName == "completionBlock" || paramName == "withCompletionBlock" ||
+      paramName == "reply" || paramName == "withReply";
+      paramName == "replyTo" || paramName == "withReplyTo";
 }
 
 // Determine whether the given type is a nullable NSError type.

test/IDE/print_clang_objc_async.swift

@@ -13,6 +13,9 @@
 // CHECK-DAG:     func doSomethingDangerous(_ operation: String) async throws -> String
 // CHECK-DAG:     func checkAvailability(completionHandler: @escaping (Bool) -> Void)
 // CHECK-DAG:     func checkAvailability() async -> Bool
+// CHECK-DAG:     func anotherExample() async -> String
+// CHECK-DAG:     func finalExample() async -> String
+// CHECK-DAG:     func replyingOperation(_ operation: String) async -> String
 // CHECK-DAG:     func findAnswer(completionHandler handler: @escaping (String?, Error?) -> Void)
 // CHECK-DAG:     func findAnswer() async throws -> String
 // CHECK-DAG:     func findAnswerFailingly(completionHandler handler: @escaping (String?, Error?) -> Void) throws

test/Inputs/clang-importer-sdk/usr/include/ObjCConcurrency.h

@@ -12,6 +12,9 @@
 -(void)doSomethingSlow:(NSString *)operation completionHandler:(void (^)(NSInteger))handler;
 -(void)doSomethingDangerous:(NSString *)operation completionHandler:(void (^ _Nullable)(NSString *_Nullable, NSError * _Nullable))handler;
 -(void)checkAvailabilityWithCompletionHandler:(void (^)(BOOL isAvailable))completionHandler;
+-(void)anotherExampleWithCompletionBlock:(void (^)(NSString *))block;
+-(void)finalExampleWithReplyTo:(void (^)(NSString *))block;
+-(void)replyingOperation:(NSString *)operation replyTo:(void (^)(NSString *))block;
 -(void)findAnswerAsynchronously:(void (^)(NSString *_Nullable, NSError * _Nullable))handler __attribute__((swift_name("findAnswer(completionHandler:)")));
 -(BOOL)findAnswerFailinglyWithError:(NSError * _Nullable * _Nullable)error completion:(void (^)(NSString *_Nullable, NSError * _Nullable))handler __attribute__((swift_name("findAnswerFailingly(completionHandler:)")));
 -(void)doSomethingFun:(NSString *)operation then:(void (^)(void))completionHandler;