Merge pull request swiftlang#38194 from ahoppen/pr-5.5/implict-return-async-refactoring

[5.5][Async Refactoring] Add `return` keyword if wrapping `ReturnStmt` is implicit

Author: ahoppen

lib/IDE/Refactoring.cpp

@@ -6477,7 +6477,8 @@ class AsyncConverter : private SourceEntityWalker {
       // for the completion handler call, e.g 'return completion(args...)'. In
       // that case, be sure not to add another return.
       auto *parent = getWalker().Parent.getAsStmt();
-      AddedReturnOrThrow = !(parent && isa<ReturnStmt>(parent));
+      AddedReturnOrThrow = !(parent && isa<ReturnStmt>(parent) &&
+                             !cast<ReturnStmt>(parent)->isImplicit());
       if (AddedReturnOrThrow)
         OS << tok::kw_return;
     } else {

test/refactoring/ConvertAsync/convert_function.swift

@@ -329,3 +329,14 @@ func withDefaultArg(x: String = "") {
 // DEFAULT-ARG:      convert_function.swift [[# @LINE-3]]:1 -> [[# @LINE-2]]:2
 // DEFAULT-ARG-NOT:  @discardableResult
 // DEFAULT-ARG-NEXT: {{^}}func withDefaultArg(x: String = "") async
+
+// RUN: %refactor -convert-to-async -dump-text -source-filename %s -pos=%(line+1):1 | %FileCheck -check-prefix=IMPLICIT-RETURN %s
+func withImplicitReturn(completionHandler: (String) -> Void) {
+  simple {
+    completionHandler($0)
+  }
+}
+// IMPLICIT-RETURN: func withImplicitReturn() async -> String {
+// IMPLICIT-RETURN-NEXT:   let val0 = await simple()
+// IMPLICIT-RETURN-NEXT:   return val0
+// IMPLICIT-RETURN-NEXT: }