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

Merge pull request #64197 from bnbarham/allow-at-or-pound

Browse Source 
[CursorInfo] Handle @ and # position
This commit is contained in:
Ben Barham
2023-03-08 08:20:15 -08:00
committed by GitHub
parent b94b362a61 daa80bba4b
commit 4eb87bda74
3 changed files with 97 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/IDE/IDERequests.cpp
View File

@@ -113,6 +113,22 @@ SourceManager &CursorInfoResolver::getSourceMgr() const
return SrcFile.getASTContext().SourceMgr;
}
static bool locationMatches(SourceLoc currentLoc, SourceLoc toResolveLoc,
SourceManager &SM) {
if (currentLoc == toResolveLoc)
return true;
if (currentLoc.getAdvancedLoc(-1) != toResolveLoc)
return false;
// Check if the location to resolve is a '@' or '#' and accept if so (to
// allow clients to send either the name location or the start of the
// attribute/expansion).
unsigned bufferID = SM.findBufferContainingLoc(toResolveLoc);
StringRef initialChar = SM.extractText({toResolveLoc, 1}, bufferID);
return initialChar == "@" || initialChar == "#";
}
bool CursorInfoResolver::tryResolve(ValueDecl *D, TypeDecl *CtorTyRef,
ExtensionDecl *ExtTyRef, SourceLoc Loc,
bool IsRef, Type Ty,
@@ -120,7 +136,7 @@ bool CursorInfoResolver::tryResolve(ValueDecl *D, TypeDecl *CtorTyRef,
if (!D->hasName())
return false;
if (Loc != LocToResolve)
if (!locationMatches(Loc, LocToResolve, getSourceMgr()))
return false;
if (auto *VD = dyn_cast<VarDecl>(D)) {