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

[migrator] Various quality improvement on type-hoist API migrations. rdar://32186526 (#9600)

Browse Source
This commit is contained in:
Xi Ge
2017-05-14 19:25:01 -07:00
committed by GitHub
parent 3570495361
commit 058d7f62e8
7 changed files with 72 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/IDE/SwiftSourceDocInfo.cpp
View File

@@ -967,6 +967,26 @@ CharSourceRange CallArgInfo::getEntireCharRange(const SourceManager &SM) const {
Lexer::getLocForEndOfToken(SM, ArgExp->getEndLoc()));
}
static Expr* getSingleNonImplicitChild(Expr *Parent) {
// If this expr is non-implicit, we are done.
if (!Parent->isImplicit())
return Parent;
// Collect all immediate children.
llvm::SmallVector<Expr*, 4> Children;
Parent->forEachImmediateChildExpr([&](Expr *E) {
Children.push_back(E);
return E;
});
// If more than one children are found, we are not sure the non-implicit node.
if (Children.size() != 1)
return Parent;
// Dig deeper if necessary.
return getSingleNonImplicitChild(Children[0]);
}
std::vector<CallArgInfo> swift::ide::
getCallArgInfo(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind) {
std::vector<CallArgInfo> InfoVec;
@@ -983,12 +1003,14 @@ getCallArgInfo(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind) {
LabelEnd = LabelStart.getAdvancedLoc(NameIdentifier.getLength());
}
InfoVec.push_back({Elem, CharSourceRange(SM, LabelStart, LabelEnd)});
InfoVec.push_back({getSingleNonImplicitChild(Elem),
CharSourceRange(SM, LabelStart, LabelEnd)});
++ElemIndex;
}
} else if (auto *PE = dyn_cast<ParenExpr>(Arg)) {
if (auto Sub = PE->getSubExpr())
InfoVec.push_back({Sub, CharSourceRange(Sub->getStartLoc(), 0)});
InfoVec.push_back({getSingleNonImplicitChild(Sub),
CharSourceRange(Sub->getStartLoc(), 0)});
}
return InfoVec;
}