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

[Refactoring] Handle default arguments when converting call to async

Browse Source 
Default arguments were still being visited when converting the call,
adding extra commas to the converted call. Skip over them.

Resolves rdar://74248990
This commit is contained in:
Ben Barham
2021-02-12 07:28:34 +10:00
parent 384b309f89
commit 0717448611
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/IDE/Refactoring.cpp
View File

@@ -5155,12 +5155,17 @@ private:
/*ToEndOfToken=*/true); /*ToEndOfToken=*/true);
OS << tok::l_paren; OS << tok::l_paren;
size_t realArgCount = 0;
for (size_t I = 0, E = Args.size() - 1; I < E; ++I) { for (size_t I = 0, E = Args.size() - 1; I < E; ++I) {
if (I > 0) if (isa<DefaultArgumentExpr>(Args[I]))
continue;
if (realArgCount > 0)
OS << tok::comma << " "; OS << tok::comma << " ";
// Can't just add the range as we need to perform replacements // Can't just add the range as we need to perform replacements
convertNode(Args[I], /*StartOverride=*/CE->getArgumentLabelLoc(I), convertNode(Args[I], /*StartOverride=*/CE->getArgumentLabelLoc(I),
/*ConvertCalls=*/false); /*ConvertCalls=*/false);
realArgCount++;
} }
OS << tok::r_paren; OS << tok::r_paren;
} }

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

@@ -112,6 +112,10 @@ func genericError<E>(completion: (String?, E?) -> Void) where E: Error { }
func otherName(execute: (String) -> Void) { } func otherName(execute: (String) -> Void) { }
// OTHER-NAME: func otherName() async -> String { } // OTHER-NAME: func otherName() async -> String { }
// RUN: %refactor -add-async-alternative -dump-text -source-filename %s -pos=%(line+1):1 | %FileCheck -check-prefix=DEFAULT_ARGS %s
func defaultArgs(a: Int, b: Int = 10, completion: (String) -> Void) { }
// DEFAULT_ARGS: func defaultArgs(a: Int, b: Int = 10) async -> String { }
struct MyStruct { struct MyStruct {
var someVar: (Int) -> Void { var someVar: (Int) -> Void {
get { get {
@@ -175,7 +179,7 @@ func noParamAutoclosure(completion: @autoclosure () -> Void) { }
// 2. Check that the various ways to call a function (and the positions the // 2. Check that the various ways to call a function (and the positions the
// refactoring is called from) are handled correctly // refactoring is called from) are handled correctly
// RUN: %refactor -convert-to-async -dump-text -source-filename %s -pos=%(line+1):1 | %FileCheck -check-prefixes=CONVERT-FUNC,CALL,CALL-NOLABEL,CALL-WRAPPED,TRAILING,TRAILING-PARENS,TRAILING-WRAPPED,CALL-ARG,MANY-CALL,MEMBER-CALL,MEMBER-CALL2,MEMBER-PARENS,EMPTY-CAPTURE,CAPTURE %s // RUN: %refactor -convert-to-async -dump-text -source-filename %s -pos=%(line+1):1 | %FileCheck -check-prefixes=CONVERT-FUNC,CALL,CALL-NOLABEL,CALL-WRAPPED,TRAILING,TRAILING-PARENS,TRAILING-WRAPPED,CALL-ARG,MANY-CALL,MEMBER-CALL,MEMBER-CALL2,MEMBER-PARENS,EMPTY-CAPTURE,CAPTURE,DEFAULT-ARGS-MISSING,DEFAULT-ARGS-CALL %s
func testCalls() { func testCalls() {
// CONVERT-FUNC: {{^}}func testCalls() async { // CONVERT-FUNC: {{^}}func testCalls() async {
// RUN: %refactor -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+4):3 | %FileCheck -check-prefix=CALL %s // RUN: %refactor -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+4):3 | %FileCheck -check-prefix=CALL %s
@@ -302,5 +306,19 @@ func testCalls() {
// CONVERT-FUNC: otherName(execute: { str in{{$}} // CONVERT-FUNC: otherName(execute: { str in{{$}}
// CONVERT-FUNC-NEXT: print("otherName"){{$}} // CONVERT-FUNC-NEXT: print("otherName"){{$}}
// CONVERT-FUNC-NEXT: }){{$}} // CONVERT-FUNC-NEXT: }){{$}}
// RUN: %refactor -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+1):3 | %FileCheck -check-prefix=DEFAULT-ARGS-MISSING %s
defaultArgs(a: 1) { str in
print("defaultArgs missing")
}
// DEFAULT-ARGS-MISSING: let str = await defaultArgs(a: 1){{$}}
// DEFAULT-ARGS-MISSING-NEXT: {{^}}print("defaultArgs missing")
// RUN: %refactor -convert-call-to-async-alternative -dump-text -source-filename %s -pos=%(line+1):3 | %FileCheck -check-prefix=DEFAULT-ARGS-CALL %s
defaultArgs(a: 1, b: 2) { str in
print("defaultArgs")
}
// DEFAULT-ARGS-CALL: let str = await defaultArgs(a: 1, b: 2){{$}}
// DEFAULT-ARGS-CALL-NEXT: {{^}}print("defaultArgs")
} }
// CONVERT-FUNC: {{^}}} // CONVERT-FUNC: {{^}}}