Skip to content

Commit 16adf76

Browse files
authored
Merge pull request swiftlang#36994 from ahoppen/pr/refactor-protocol-requirement-async
[Refactoring] Fix crash when refactoring protocol requirement to async
2 parents 71fd7f9 + 9d62f9d commit 16adf76

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

lib/IDE/Refactoring.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4906,7 +4906,7 @@ class AsyncConverter : private SourceEntityWalker {
49064906
RightStartLoc = Lexer::getLocForEndOfToken(SM, FD->getThrowsLoc());
49074907
}
49084908
SourceLoc RightEndLoc =
4909-
FD->getBody() ? FD->getBody()->getLBraceLoc() : FD->getEndLoc();
4909+
FD->getBody() ? FD->getBody()->getLBraceLoc() : RightStartLoc;
49104910
addRange(RightStartLoc, RightEndLoc);
49114911
return;
49124912
}

test/refactoring/ConvertAsync/basic.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,15 @@ struct MyStruct {
150150
func retStruct() -> MyStruct { return MyStruct() }
151151

152152
protocol MyProtocol {
153-
// RUN: %refactor -add-async-alternative -dump-text -source-filename %s -pos=%(line+1):3 | %FileCheck -check-prefix=PROTO-MEMBER %s
153+
// RUN: %refactor -add-async-alternative -dump-text -source-filename %s -pos=%(line+2):3 | %FileCheck -check-prefix=PROTO-MEMBER %s
154+
// RUN: %refactor -convert-to-async -dump-text -source-filename %s -pos=%(line+1):3 | %FileCheck -check-prefix=PROTO-MEMBER-TO-ASYNC %s
154155
func protoMember(completion: (String) -> Void)
155156
// PROTO-MEMBER: func protoMember() async -> String{{$}}
157+
158+
// FIXME: The current async refactoring only refactors the client side and thus only adds the 'async' keyword.
159+
// We should be refactoring the entire method signature here and removing the completion parameter.
160+
// This test currently checks that we are not crashing.
161+
// PROTO-MEMBER-TO-ASYNC: func protoMember(completion: (String) -> Void) async
156162
}
157163

158164
// RUN: not %refactor -add-async-alternative -dump-text -source-filename %s -pos=%(line+1):1

0 commit comments

Comments
 (0)