Skip to content

Commit e4fbb32

Browse files
Nathan Hawesrjmccall
Nathan Hawes
authored and
rjmccall
committed
[IDE][Refactoring] Update syntactic rename to support braceless multiple trailing closures.
1 parent 8727fac commit e4fbb32

18 files changed

+178
-83
lines changed

‎include/swift/IDE/Utils.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ struct ResolvedLoc {
222222
ASTWalker::ParentTy Node;
223223
CharSourceRange Range;
224224
std::vector<CharSourceRange> LabelRanges;
225+
Optional<unsigned> FirstTrailingLabel;
225226
LabelRangeType LabelType;
226227
bool IsActive;
227228
bool IsInSelector;
@@ -268,7 +269,8 @@ class NameMatcher: public ASTWalker {
268269
bool tryResolve(ASTWalker::ParentTy Node, SourceLoc NameLoc);
269270
bool tryResolve(ASTWalker::ParentTy Node, DeclNameLoc NameLoc, Expr *Arg);
270271
bool tryResolve(ASTWalker::ParentTy Node, SourceLoc NameLoc, LabelRangeType RangeType,
271-
ArrayRef<CharSourceRange> LabelLocs);
272+
ArrayRef<CharSourceRange> LabelLocs,
273+
Optional<unsigned> FirstTrailingLabel);
272274
bool handleCustomAttrs(Decl *D);
273275
Expr *getApplicableArgFor(Expr* E);
274276

@@ -579,10 +581,10 @@ struct CallArgInfo {
579581
std::vector<CallArgInfo>
580582
getCallArgInfo(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind);
581583

582-
// Get the ranges of argument labels from an Arg, either tuple or paren.
583-
// This includes empty ranges for any unlabelled arguments, and excludes
584-
// trailing closures.
585-
std::vector<CharSourceRange>
584+
// Get the ranges of argument labels from an Arg, either tuple or paren, and
585+
// the index of the first trailing closure argument, if any. This includes empty
586+
// ranges for any unlabelled arguments, including the first trailing closure.
587+
std::pair<std::vector<CharSourceRange>, Optional<unsigned>>
586588
getCallArgLabelRanges(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind);
587589

588590
/// Whether a decl is defined from clang source.

‎lib/IDE/Refactoring.cpp

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,12 @@ class Renamer {
109109
/// Adds replacements to rename the given label ranges
110110
/// \return true if the label ranges do not match the old name
111111
bool renameLabels(ArrayRef<CharSourceRange> LabelRanges,
112+
Optional<unsigned> FirstTrailingLabel,
112113
LabelRangeType RangeType, bool isCallSite) {
113114
if (isCallSite)
114-
return renameLabelsLenient(LabelRanges, RangeType);
115+
return renameLabelsLenient(LabelRanges, FirstTrailingLabel, RangeType);
115116

117+
assert(!FirstTrailingLabel);
116118
ArrayRef<StringRef> OldLabels = Old.args();
117119

118120
if (OldLabels.size() != LabelRanges.size())
@@ -239,10 +241,56 @@ class Renamer {
239241
}
240242

241243
bool renameLabelsLenient(ArrayRef<CharSourceRange> LabelRanges,
244+
Optional<unsigned> FirstTrailingLabel,
242245
LabelRangeType RangeType) {
243246

244247
ArrayRef<StringRef> OldNames = Old.args();
245248

249+
// First, match trailing closure arguments in reverse
250+
if (FirstTrailingLabel) {
251+
auto TrailingLabels = LabelRanges.drop_front(*FirstTrailingLabel);
252+
LabelRanges = LabelRanges.take_front(*FirstTrailingLabel);
253+
254+
for (auto LabelIndex: llvm::reverse(indices(TrailingLabels))) {
255+
CharSourceRange Label = TrailingLabels[LabelIndex];
256+
257+
if (Label.getByteLength()) {
258+
if (OldNames.empty())
259+
return true;
260+
261+
while (!labelRangeMatches(Label, LabelRangeType::Selector,
262+
OldNames.back())) {
263+
if ((OldNames = OldNames.drop_back()).empty())
264+
return true;
265+
}
266+
splitAndRenameLabel(Label, LabelRangeType::Selector,
267+
OldNames.size() - 1);
268+
OldNames = OldNames.drop_back();
269+
continue;
270+
}
271+
272+
// empty labelled trailing closure label
273+
if (LabelIndex) {
274+
if (OldNames.empty())
275+
return true;
276+
277+
while (!OldNames.back().empty()) {
278+
if ((OldNames = OldNames.drop_back()).empty())
279+
return true;
280+
}
281+
splitAndRenameLabel(Label, LabelRangeType::Selector,
282+
OldNames.size() - 1);
283+
OldNames = OldNames.drop_back();
284+
continue;
285+
}
286+
287+
// unlabelled trailing closure label
288+
OldNames = OldNames.drop_back();
289+
continue;
290+
}
291+
}
292+
293+
// Next, match the non-trailing arguments.
246294
size_t NameIndex = 0;
247295

248296
for (CharSourceRange Label : LabelRanges) {
@@ -377,7 +425,8 @@ class Renamer {
377425
(Config.Usage != NameUsage::Reference || IsSubscript) &&
378426
Resolved.LabelType == LabelRangeType::CallArg;
379427

380-
if (renameLabels(Resolved.LabelRanges, Resolved.LabelType, isCallSite))
428+
if (renameLabels(Resolved.LabelRanges, Resolved.FirstTrailingLabel,
429+
Resolved.LabelType, isCallSite))
381430
return Config.Usage == NameUsage::Unknown ?
382431
RegionType::Unmatched : RegionType::Mismatch;
383432
}

‎lib/IDE/SwiftSourceDocInfo.cpp

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ std::vector<ResolvedLoc> NameMatcher::resolve(ArrayRef<UnresolvedLoc> Locs, Arra
102102

103103
// handle any unresolved locs past the end of the last AST node or comment
104104
std::vector<ResolvedLoc> Remaining(Locs.size() - ResolvedLocs.size(), {
105-
ASTWalker::ParentTy(), CharSourceRange(), {}, LabelRangeType::None,
105+
ASTWalker::ParentTy(), CharSourceRange(), {}, None, LabelRangeType::None,
106106
/*isActice*/true, /*isInSelector*/false});
107107
ResolvedLocs.insert(ResolvedLocs.end(), Remaining.begin(), Remaining.end());
108108

@@ -236,15 +236,15 @@ bool NameMatcher::walkToDeclPre(Decl *D) {
236236
LabelRanges = getLabelRanges(ParamList, getSourceMgr());
237237
}
238238
tryResolve(ASTWalker::ParentTy(D), D->getLoc(), LabelRangeType::Param,
239-
LabelRanges);
239+
LabelRanges, None);
240240
} else if (SubscriptDecl *SD = dyn_cast<SubscriptDecl>(D)) {
241241
tryResolve(ASTWalker::ParentTy(D), D->getLoc(), LabelRangeType::NoncollapsibleParam,
242-
getLabelRanges(SD->getIndices(), getSourceMgr()));
242+
getLabelRanges(SD->getIndices(), getSourceMgr()), None);
243243
} else if (EnumElementDecl *EED = dyn_cast<EnumElementDecl>(D)) {
244244
if (auto *ParamList = EED->getParameterList()) {
245245
auto LabelRanges = getEnumParamListInfo(getSourceMgr(), ParamList);
246246
tryResolve(ASTWalker::ParentTy(D), D->getLoc(), LabelRangeType::CallArg,
247-
LabelRanges);
247+
LabelRanges, None);
248248
} else {
249249
tryResolve(ASTWalker::ParentTy(D), D->getLoc());
250250
}
@@ -360,7 +360,8 @@ std::pair<bool, Expr*> NameMatcher::walkToExprPre(Expr *E) {
360360

361361
auto Labels = getCallArgLabelRanges(getSourceMgr(), SubExpr->getIndex(),
362362
LabelRangeEndAt::BeforeElemStart);
363-
tryResolve(ASTWalker::ParentTy(E), E->getLoc(), LabelRangeType::CallArg, Labels);
363+
tryResolve(ASTWalker::ParentTy(E), E->getLoc(), LabelRangeType::CallArg,
364+
Labels.first, Labels.second);
364365
if (isDone())
365366
break;
366367
if (!SubExpr->getIndex()->walk(*this))
@@ -377,7 +378,7 @@ std::pair<bool, Expr*> NameMatcher::walkToExprPre(Expr *E) {
377378
auto Labels = getCallArgLabelRanges(getSourceMgr(), P,
378379
LabelRangeEndAt::BeforeElemStart);
379380
tryResolve(ASTWalker::ParentTy(E), P->getLParenLoc(),
380-
LabelRangeType::CallArg, Labels);
381+
LabelRangeType::CallArg, Labels.first, Labels.second);
381382
break;
382383
}
383384
case ExprKind::Tuple: {
@@ -386,7 +387,7 @@ std::pair<bool, Expr*> NameMatcher::walkToExprPre(Expr *E) {
386387
auto Labels = getCallArgLabelRanges(getSourceMgr(), T,
387388
LabelRangeEndAt::BeforeElemStart);
388389
tryResolve(ASTWalker::ParentTy(E), T->getLParenLoc(),
389-
LabelRangeType::CallArg, Labels);
390+
LabelRangeType::CallArg, Labels.first, Labels.second);
390391
if (isDone())
391392
break;
392393

@@ -483,8 +484,10 @@ bool NameMatcher::walkToTypeReprPre(TypeRepr *T) {
483484
// If we're walking a CustomAttr's type we may have an associated call
484485
// argument to resolve with from its semantic initializer.
485486
if (CustomAttrArg.hasValue() && CustomAttrArg->Loc == T->getLoc()) {
487+
auto Labels = getCallArgLabelRanges(getSourceMgr(), CustomAttrArg->Item,
488+
LabelRangeEndAt::BeforeElemStart);
486489
tryResolve(ASTWalker::ParentTy(T), T->getLoc(), LabelRangeType::CallArg,
487-
getCallArgLabelRanges(getSourceMgr(), CustomAttrArg->Item, LabelRangeEndAt::BeforeElemStart));
490+
Labels.first, Labels.second);
488491
} else {
489492
tryResolve(ASTWalker::ParentTy(T), T->getLoc());
490493
}
@@ -525,7 +528,7 @@ void NameMatcher::skipLocsBefore(SourceLoc Start) {
525528
if (!checkComments()) {
526529
LocsToResolve.pop_back();
527530
ResolvedLocs.push_back({ASTWalker::ParentTy(), CharSourceRange(), {},
528-
LabelRangeType::None, isActive(), isInSelector()});
531+
None, LabelRangeType::None, isActive(), isInSelector()});
529532
}
530533
}
531534
}
@@ -590,7 +593,7 @@ bool NameMatcher::tryResolve(ASTWalker::ParentTy Node, DeclNameLoc NameLoc,
590593
if (NameLoc.isCompound()) {
591594
auto Labels = getSelectorLabelRanges(getSourceMgr(), NameLoc);
592595
bool Resolved = tryResolve(Node, NameLoc.getBaseNameLoc(),
593-
LabelRangeType::Selector, Labels);
596+
LabelRangeType::Selector, Labels, None);
594597
if (!isDone()) {
595598
for (auto Label: Labels) {
596599
if (tryResolve(Node, Label.getStart())) {
@@ -604,23 +607,26 @@ bool NameMatcher::tryResolve(ASTWalker::ParentTy Node, DeclNameLoc NameLoc,
604607
}
605608

606609
if (LocsToResolve.back().ResolveArgLocs) {
607-
if (Arg)
610+
if (Arg) {
611+
auto Labels = getCallArgLabelRanges(getSourceMgr(), Arg,
612+
LabelRangeEndAt::BeforeElemStart);
608613
return tryResolve(Node, NameLoc.getBaseNameLoc(), LabelRangeType::CallArg,
609-
getCallArgLabelRanges(getSourceMgr(), Arg,
610-
LabelRangeEndAt::BeforeElemStart));
614+
Labels.first, Labels.second);
615+
}
611616
}
612617

613618
return tryResolve(Node, NameLoc.getBaseNameLoc());
614619
}
615620

616621
bool NameMatcher::tryResolve(ASTWalker::ParentTy Node, SourceLoc NameLoc) {
617622
assert(!isDone());
618-
return tryResolve(Node, NameLoc, LabelRangeType::None, None);
623+
return tryResolve(Node, NameLoc, LabelRangeType::None, None, None);
619624
}
620625

621626
bool NameMatcher::tryResolve(ASTWalker::ParentTy Node, SourceLoc NameLoc,
622627
LabelRangeType RangeType,
623-
ArrayRef<CharSourceRange> LabelRanges) {
628+
ArrayRef<CharSourceRange> LabelRanges,
629+
Optional<unsigned> FirstTrailingLabel) {
624630
skipLocsBefore(NameLoc);
625631
if (isDone())
626632
return false;
@@ -632,8 +638,8 @@ bool NameMatcher::tryResolve(ASTWalker::ParentTy Node, SourceLoc NameLoc,
632638
if (Range.isValid()) {
633639
if (NameLoc == Next.Loc) {
634640
LocsToResolve.pop_back();
635-
ResolvedLocs.push_back({Node, Range, LabelRanges, RangeType,
636-
isActive(), isInSelector()});
641+
ResolvedLocs.push_back({Node, Range, LabelRanges, FirstTrailingLabel,
642+
RangeType, isActive(), isInSelector()});
637643
if (isDone())
638644
return true;
639645
WasResolved = true;
@@ -647,7 +653,7 @@ bool NameMatcher::tryResolve(ASTWalker::ParentTy Node, SourceLoc NameLoc,
647653
Range.getByteLength() - 1);
648654
if (NewRange.getStart() == Next.Loc) {
649655
LocsToResolve.pop_back();
650-
ResolvedLocs.push_back({Node, NewRange, {}, LabelRangeType::None,
656+
ResolvedLocs.push_back({Node, NewRange, {}, None, LabelRangeType::None,
651657
isActive(), isInSelector()});
652658
WasResolved = true;
653659
}
@@ -879,6 +885,7 @@ std::vector<CallArgInfo> swift::ide::
879885
getCallArgInfo(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind) {
880886
std::vector<CallArgInfo> InfoVec;
881887
if (auto *TE = dyn_cast<TupleExpr>(Arg)) {
888+
auto FirstTrailing = TE->getUnlabeledTrailingClosureIndexOfPackedArgument();
882889
for (size_t ElemIndex: range(TE->getNumElements())) {
883890
Expr *Elem = TE->getElement(ElemIndex);
884891
if (isa<DefaultArgumentExpr>(Elem))
@@ -887,14 +894,14 @@ getCallArgInfo(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind) {
887894
SourceLoc LabelStart(Elem->getStartLoc());
888895
SourceLoc LabelEnd(LabelStart);
889896

890-
auto NameIdentifier = TE->getElementName(ElemIndex);
891-
if (!NameIdentifier.empty()) {
892-
LabelStart = TE->getElementNameLoc(ElemIndex);
893-
if (EndKind == LabelRangeEndAt::LabelNameOnly)
894-
LabelEnd = LabelStart.getAdvancedLoc(NameIdentifier.getLength());
897+
bool IsTrailingClosure = FirstTrailing && ElemIndex >= *FirstTrailing;
898+
SourceLoc NameLoc = TE->getElementNameLoc(ElemIndex);
899+
if (NameLoc.isValid()) {
900+
LabelStart = NameLoc;
901+
if (EndKind == LabelRangeEndAt::LabelNameOnly || IsTrailingClosure) {
902+
LabelEnd = Lexer::getLocForEndOfToken(SM, NameLoc);
903+
}
895904
}
896-
bool IsTrailingClosure = TE->hasTrailingClosure() &&
897-
ElemIndex == TE->getNumElements() - 1;
898905
InfoVec.push_back({getSingleNonImplicitChild(Elem),
899906
CharSourceRange(SM, LabelStart, LabelEnd), IsTrailingClosure});
900907
}
@@ -909,17 +916,19 @@ getCallArgInfo(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind) {
909916
return InfoVec;
910917
}
911918

912-
std::vector<CharSourceRange> swift::ide::
919+
std::pair<std::vector<CharSourceRange>, Optional<unsigned>> swift::ide::
913920
getCallArgLabelRanges(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind) {
914921
std::vector<CharSourceRange> Ranges;
915922
auto InfoVec = getCallArgInfo(SM, Arg, EndKind);
916923

917-
auto EndWithoutTrailing = std::remove_if(InfoVec.begin(), InfoVec.end(),
918-
[](CallArgInfo &Info) {
919-
return Info.IsTrailingClosure;
920-
});
921-
std::transform(InfoVec.begin(), EndWithoutTrailing,
922-
std::back_inserter(Ranges),
924+
Optional<unsigned> FirstTrailing;
925+
auto I = std::find_if(InfoVec.begin(), InfoVec.end(), [](CallArgInfo &Info) {
926+
return Info.IsTrailingClosure;
927+
});
928+
if (I != InfoVec.end())
929+
FirstTrailing = std::distance(InfoVec.begin(), I);
930+
931+
std::transform(InfoVec.begin(), InfoVec.end(), std::back_inserter(Ranges),
923932
[](CallArgInfo &Info) { return Info.LabelRange; });
924-
return Ranges;
933+
return {Ranges, FirstTrailing};
925934
}

‎lib/Migrator/APIDiffMigratorPass.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,11 +505,16 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
505505
auto Ranges = getCallArgLabelRanges(SM, Arg,
506506
LabelRangeEndAt::LabelNameOnly);
507507
llvm::SmallVector<uint8_t, 2> ToRemoveIndices;
508-
for (unsigned I = 0; I < Ranges.size(); I ++) {
508+
for (unsigned I = 0; I < Ranges.first.size(); I ++) {
509509
if (std::any_of(IgnoreArgIndex.begin(), IgnoreArgIndex.end(),
510510
[I](unsigned Ig) { return Ig == I; }))
511511
continue;
512-
auto LR = Ranges[I];
512+
513+
// Ignore the first trailing closure label
514+
if (Ranges.second && I == Ranges.second)
515+
continue;
516+
517+
auto LR = Ranges.first[I];
513518
if (Idx < NewName.argSize()) {
514519
auto Label = NewName.args()[Idx++];
515520

@@ -528,7 +533,7 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
528533
auto Ranges = getCallArgLabelRanges(SM, Arg,
529534
LabelRangeEndAt::BeforeElemStart);
530535
for (auto I : ToRemoveIndices) {
531-
Editor.remove(Ranges[I]);
536+
Editor.remove(Ranges.first[I]);
532537
}
533538
}
534539
}

‎test/refactoring/SyntacticRename/FindRangeOutputs/callsites/defaults.swift.expected

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ func /*trailing:def*/withTrailingClosure(x: Int, y: () -> Int) {}
2121
// valid
2222
/*trailing:call*/withTrailingClosure(x: 2, y: { return 1})
2323
/*trailing:call*/withTrailingClosure(x: 2) { return 1}
24-
25-
// false positives
26-
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
27-
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
2824
/*trailing:call*/withTrailingClosure(x: 2)
2925
{ return 1}
26+
// invalid
27+
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
28+
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
3029

3130
func /*trailing-only:def*/trailingOnly(a: () -> ()) {}
3231
/*trailing-only:call*/trailingOnly(a: {})

‎test/refactoring/SyntacticRename/FindRangeOutputs/callsites/trailing.swift.expected

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ func /*trailing:def*/<base>withTrailingClosure</base>(<arglabel index=0>x</argla
2121
// valid
2222
/*trailing:call*/<base>withTrailingClosure</base>(<callarg index=0>x</callarg><callcolon index=0>: </callcolon>2, <callarg index=1>y</callarg><callcolon index=1>: </callcolon>{ return 1})
2323
/*trailing:call*/<base>withTrailingClosure</base>(<callarg index=0>x</callarg><callcolon index=0>: </callcolon>2) { return 1}
24-
25-
// false positives
26-
/*trailing:call*/<base>withTrailingClosure</base>(<callarg index=0>x</callarg><callcolon index=0>: </callcolon>1, <callarg index=1>y</callarg><callcolon index=1>: </callcolon>2) { return 1}
27-
/*trailing:call*/<base>withTrailingClosure</base>(<callarg index=0>x</callarg><callcolon index=0>: </callcolon>1, <callarg index=1>y</callarg><callcolon index=1>: </callcolon>2) { return 1}
2824
/*trailing:call*/<base>withTrailingClosure</base>(<callarg index=0>x</callarg><callcolon index=0>: </callcolon>2)
2925
{ return 1}
26+
// invalid
27+
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
28+
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
3029

3130
func /*trailing-only:def*/trailingOnly(a: () -> ()) {}
3231
/*trailing-only:call*/trailingOnly(a: {})

‎test/refactoring/SyntacticRename/FindRangeOutputs/callsites/trailing_only.swift.expected

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ func /*trailing:def*/withTrailingClosure(x: Int, y: () -> Int) {}
2121
// valid
2222
/*trailing:call*/withTrailingClosure(x: 2, y: { return 1})
2323
/*trailing:call*/withTrailingClosure(x: 2) { return 1}
24-
25-
// false positives
26-
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
27-
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
2824
/*trailing:call*/withTrailingClosure(x: 2)
2925
{ return 1}
26+
// invalid
27+
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
28+
/*trailing:call*/withTrailingClosure(x: 1, y: 2) { return 1}
3029

3130
func /*trailing-only:def*/<base>trailingOnly</base>(<arglabel index=0>a</arglabel><param index=0></param>: () -> ()) {}
3231
/*trailing-only:call*/<base>trailingOnly</base>(<callarg index=0>a</callarg><callcolon index=0>: </callcolon>{})

‎test/refactoring/SyntacticRename/FindRangeOutputs/multiple-trailing-closures-defaulted.swift.expected

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
func /*test:def*/<base>test</base>(<arglabel index=0>x</arglabel><param index=0></param>: () -> () = {}, <arglabel index=1>_</arglabel><param index=1> xx</param>: () -> () = {}, <arglabel index=2>y</arglabel><param index=2></param>: () -> () = {}, <arglabel index=3>z</arglabel><param index=3></param>: ()->() = {}) {}
2+
3+
/*test:call*/<base>test</base>(<callarg index=0>x</callarg><callcolon index=0>: </callcolon>{}, <callcombo index=1></callcombo>{}) {}
4+
/*test:call*/<base>test</base>(<callarg index=0>x</callarg><callcolon index=0>: </callcolon>{}) {} <sel index=3>z</sel>: {}
5+
/*test:call*/<base>test</base>(<callarg index=0>x</callarg><callcolon index=0>: </callcolon>{}, <callcombo index=1></callcombo>{}) {}
6+
/*test:call*/<base>test</base> {} <sel index=2>y</sel>: {}
7+
/*test:call*/<base>test</base>(<callarg index=2>y</callarg><callcolon index=2>: </callcolon>{}) {}
8+
9+

0 commit comments

Comments
 (0)