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

[Sema] Unify fix-it logic for enclosing trailing closure in argument parens (#4961)

Browse Source 
`tryDiagnoseTrailingClosureAmbiguity` and `checkStmtConditionTrailingClosure`
had similar logic.
Added swift::fixItEncloseTrailingClosure function.
This commit is contained in:
Rintaro Ishizaki
2016-09-24 18:33:40 +09:00
committed by GitHub
parent 5bc8ca7f75
commit 65f3ba5dbb
3 changed files with 69 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/Sema/CSDiag.cpp
View File

@@ -376,47 +376,12 @@ tryDiagnoseTrailingClosureAmbiguity(TypeChecker &tc, const Expr *expr,
// If we got here, then all of the choices have unique labels. Offer them in
// order.
SourceManager &sourceMgr = tc.Context.SourceMgr;
SourceLoc replaceStartLoc;
SourceLoc closureStartLoc;
bool hasOtherArgs, needsParens;
if (auto tupleArgs = dyn_cast<TupleExpr>(callExpr->getArg())) {
assert(tupleArgs->getNumElements() >= 2);
const Expr *lastBeforeClosure = tupleArgs->getElements().drop_back().back();
replaceStartLoc =
Lexer::getLocForEndOfToken(sourceMgr, lastBeforeClosure->getEndLoc());
closureStartLoc = tupleArgs->getElements().back()->getStartLoc();
hasOtherArgs = true;
needsParens = false;
} else {
auto parenArgs = cast<ParenExpr>(callExpr->getArg());
replaceStartLoc = parenArgs->getRParenLoc();
closureStartLoc = parenArgs->getSubExpr()->getStartLoc();
hasOtherArgs = false;
needsParens = parenArgs->getRParenLoc().isInvalid();
}
if (!replaceStartLoc.isValid()) {
assert(callExpr->getFn()->getEndLoc().isValid());
replaceStartLoc =
Lexer::getLocForEndOfToken(sourceMgr, callExpr->getFn()->getEndLoc());
}
for (const auto &choicePair : choicesByLabel) {
SmallString<64> insertionString;
if (needsParens)
insertionString += "(";
else if (hasOtherArgs)
insertionString += ", ";
if (!choicePair.first.empty()) {
insertionString += choicePair.first.str();
insertionString += ": ";
}
tc.diagnose(expr->getLoc(), diag::ambiguous_because_of_trailing_closure,
choicePair.first.empty(), choicePair.second->getFullName())
.fixItReplaceChars(replaceStartLoc, closureStartLoc, insertionString)
.fixItInsertAfter(callExpr->getEndLoc(), ")");
auto diag = tc.diagnose(expr->getLoc(),
diag::ambiguous_because_of_trailing_closure,
choicePair.first.empty(),
choicePair.second->getFullName());
swift::fixItEncloseTrailingClosure(tc, diag, callExpr, choicePair.first);
}
return true;