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

[AST] Factor out Expr::getNameLoc

Browse Source 
There are a bunch of AST nodes that can have
associated DeclNameLocs, make sure we cover them
all. I don't think this makes a difference for
`unwrapPropertyWrapperParameterTypes` since the
extra cases should be invalid, but for cursor info
it ensures we handle UnresolvedMemberExprs.
This commit is contained in:
Hamish Knight
2024-12-05 15:55:19 +00:00
parent dd97862305
commit c4efa0d5f0
5 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/IDE/CursorInfo.cpp
View File

@@ -214,23 +214,6 @@ private:
return Action::Continue();
}
/// Retrieve the name location for an expression that supports cursor info.
DeclNameLoc getExprNameLoc(Expr *E) {
if (auto *DRE = dyn_cast<DeclRefExpr>(E))
return DRE->getNameLoc();
if (auto *UDRE = dyn_cast<UnresolvedDeclRefExpr>(E))
return UDRE->getNameLoc();
if (auto *ODRE = dyn_cast<OverloadedDeclRefExpr>(E))
return ODRE->getNameLoc();
if (auto *UDE = dyn_cast<UnresolvedDotExpr>(E))
return UDE->getNameLoc();
return DeclNameLoc();
}
PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
if (auto closure = dyn_cast<ClosureExpr>(E)) {
DeclContextStack.push_back(closure);
@@ -247,7 +230,7 @@ private:
}
}
if (getExprNameLoc(E).getBaseNameLoc() != LocToResolve)
if (E->getNameLoc().getBaseNameLoc() != LocToResolve)
return Action::Continue(E);
assert(Result == nullptr);