averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SourceKit] Address FIXMEs for the NameMatcher

Browse Source 
rdar://118996561
This commit is contained in:
Alex Hoppen
2023-12-11 16:55:50 -08:00
parent bf102d2079
commit 9219b0cd71
4 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
View File

@@ -2565,20 +2565,19 @@ void SwiftLangSupport::findRelatedIdentifiersInFile(
// symbols. This makes related idents more fault-tolerant.
DiagnosticEngine Diags(SrcMgr);
std::vector<ResolvedLoc> ResolvedLocs = resolveRenameLocations(
Locs.getLocations(), /*NewName=*/StringRef(), *SrcFile, Diags);
std::vector<ResolvedAndRenameLoc> ResolvedAndRenameLocs =
resolveRenameLocations(Locs.getLocations(), /*NewName=*/StringRef(),
*SrcFile, Diags);
SmallVector<RelatedIdentInfo, 8> Ranges;
assert(ResolvedLocs.size() == Locs.getLocations().size());
for (auto [RenameLoc, ResolvedLoc] :
llvm::zip_equal(Locs.getLocations(), ResolvedLocs)) {
if (ResolvedLoc.range.isInvalid()) {
for (auto Loc : ResolvedAndRenameLocs) {
if (Loc.resolved.range.isInvalid()) {
continue;
}
unsigned Offset =
SrcMgr.getLocOffsetInBuffer(ResolvedLoc.range.getStart(), BufferID);
unsigned Offset = SrcMgr.getLocOffsetInBuffer(
Loc.resolved.range.getStart(), BufferID);
Ranges.push_back(
{Offset, ResolvedLoc.range.getByteLength(), RenameLoc.Usage});
{Offset, Loc.resolved.range.getByteLength(), Loc.renameLoc.Usage});
}
return RelatedIdentsResult(Ranges, OldName);