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

[Diagnostics] Try to compute precise diagnostic anchor

Browse Source
This commit is contained in:
Pavel Yaskevich
2018-08-09 13:53:33 -07:00
parent f5aa0d9c75
commit 284e109f1e
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Sema/CSDiagnostics.cpp
View File

@@ -26,6 +26,32 @@ using namespace constraints;
FailureDiagnostic::~FailureDiagnostic() {}
Expr *FailureDiagnostic::computeAnchor() const {
auto &cs = getConstraintSystem();
auto *locator = getLocator();
// Resolve the locator to a specific expression.
SourceRange range;
bool isSubscriptMember =
(!locator->getPath().empty() && locator->getPath().back().getKind() ==
ConstraintLocator::SubscriptMember);
ConstraintLocator *resolved = simplifyLocator(cs, locator, range);
if (!resolved || !resolved->getAnchor())
return locator->getAnchor();
Expr *anchor = resolved->getAnchor();
// FIXME: Work around an odd locator representation that doesn't separate the
// base of a subscript member from the member access.
if (isSubscriptMember) {
if (auto subscript = dyn_cast<SubscriptExpr>(anchor))
return subscript->getBase();
}
return anchor;
}
Type FailureDiagnostic::getType(Expr *expr) const {
auto &cs = getConstraintSystem();
return solution.simplifyType(cs.getType(expr));