Merge pull request #36994 from ahoppen/pr/refactor-protocol-requirement-async

[Refactoring] Fix crash when refactoring protocol requirement to async

Author: ahoppen

lib/IDE/Refactoring.cpp

@@ -4906,7 +4906,7 @@ class AsyncConverter : private SourceEntityWalker {
         RightStartLoc = Lexer::getLocForEndOfToken(SM, FD->getThrowsLoc());
       }
       SourceLoc RightEndLoc =
-          FD->getBody() ? FD->getBody()->getLBraceLoc() : FD->getEndLoc();
+          FD->getBody() ? FD->getBody()->getLBraceLoc() : RightStartLoc;
       addRange(RightStartLoc, RightEndLoc);
       return;
     }

test/refactoring/ConvertAsync/basic.swift

@@ -150,9 +150,15 @@ struct MyStruct {
 func retStruct() -> MyStruct { return MyStruct() }
 
 protocol MyProtocol {
-  // RUN: %refactor -add-async-alternative -dump-text -source-filename %s -pos=%(line+1):3 | %FileCheck -check-prefix=PROTO-MEMBER %s
+  // RUN: %refactor -add-async-alternative -dump-text -source-filename %s -pos=%(line+2):3 | %FileCheck -check-prefix=PROTO-MEMBER %s
+  // RUN: %refactor -convert-to-async -dump-text -source-filename %s -pos=%(line+1):3 | %FileCheck -check-prefix=PROTO-MEMBER-TO-ASYNC %s
   func protoMember(completion: (String) -> Void)
   // PROTO-MEMBER: func protoMember() async -> String{{$}}
+
+  // FIXME: The current async refactoring only refactors the client side and thus only adds the 'async' keyword.
+  // We should be refactoring the entire method signature here and removing the completion parameter.
+  // This test currently checks that we are not crashing.
+  // PROTO-MEMBER-TO-ASYNC: func protoMember(completion: (String) -> Void) async
 }
 
 // RUN: not %refactor -add-async-alternative -dump-text -source-filename %s -pos=%(line+1):1