averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[Refactoring] Fix crash when refactoring protocol requirement to async
This commit is contained in:
Alex Hoppen
2021-04-22 17:02:44 +02:00
committed by GitHub
parent 71fd7f9cb2 9d62f9d4db
commit 16adf76b68
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/IDE/Refactoring.cpp
View File

@@ -4906,7 +4906,7 @@ private:
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;
}

8
test/refactoring/ConvertAsync/basic.swift
View File

@@ -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