[Concurrency] Move "extra" text from completion handler parameter to base name.

When a completion-handler parameter has text before, e.g.,
"WithCompletionHandler", put the extra text on the base name rather
than the corresponding parameter. This ensures that we don't lose the
detail from the text, but always put it into a consistent place.

Author: DougGregor

lib/Basic/StringExtras.cpp

@@ -1322,10 +1322,10 @@ bool swift::omitNeedlessWords(StringRef &baseName,
   }
 
   // If this is an asynchronous function where the completion handler is
-  // the second parameter, and the corresponding name has some additional
-  // information prior to WithCompletion(Handler), append that
+  // past the first parameter the corresponding name has some additional
+  // information prior to the completion-handled suffix, append that
   // additional text to the base name.
-  if (isAsync && *completionHandlerIndex == 1 && completionHandlerName) {
+  if (isAsync && *completionHandlerIndex >= 1 && completionHandlerName) {
     if (auto extraParamText = stripWithCompletionHandlerSuffix(
             *completionHandlerName)) {
       SmallString<32> newBaseName;
@@ -1355,20 +1355,6 @@ bool swift::omitNeedlessWords(StringRef &baseName,
         name, paramTypes[i], role,
         role == NameRole::BaseName ? allPropertyNames : nullptr);
 
-    // If this is an asynchronous function where the completion handler is
-    // past the second parameter and has additional information in the name,
-    // add that information to the prior argument name.
-    if (isAsync && completionHandlerName && *completionHandlerIndex > 1 &&
-        *completionHandlerIndex == i + 1) {
-      if (auto extraParamText = stripWithCompletionHandlerSuffix(
-              *completionHandlerName)) {
-        SmallString<32> extendedName;
-        extendedName += newName;
-        appendSentenceCase(extendedName, *extraParamText);
-        newName = scratch.copyString(extendedName);
-      }
-    }
-
     if (name == newName) continue;
 
     // Record this change.

lib/ClangImporter/ImportName.cpp

@@ -1139,7 +1139,7 @@ static bool isCompletionHandlerParamName(StringRef paramName) {
       paramName == "withCompletionHandler" ||
       paramName == "completion" || paramName == "withCompletion" ||
       paramName == "completionBlock" || paramName == "withCompletionBlock" ||
-      paramName == "reply" || paramName == "withReply";
+      paramName == "reply" || paramName == "withReply" ||
       paramName == "replyTo" || paramName == "withReplyTo";
 }
 

test/ClangImporter/objc_async.swift

@@ -24,7 +24,7 @@ func testSlowServer(slowServer: SlowServer) async throws {
   let _: Int = await try slowServer.magicNumber(withSeed: 42)
 
   await slowServer.serverRestart("localhost")
-  await slowServer.server("localhost", atPriorityRestart: 0.8)
+  await slowServer.serverRestart("localhost", atPriority: 0.8)
 
   _ = await slowServer.allOperations()
 }