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

Merge pull request #35873 from nathawes/cursor-info-parent-usrs

Browse Source 
[SourceKit][SymbolGraph] Add a 'parent_contexts' field the CursorInfo response
This commit is contained in:
Argyrios Kyrtzidis
2021-02-11 21:24:01 -08:00
committed by GitHub
parent 6c015ca619 6d940951ca
commit 9ef86bd110
11 changed files with 356 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -485,7 +485,7 @@ void SwiftLangSupport::printFullyAnnotatedSynthesizedDeclaration(
}
template <typename FnTy>
void walkRelatedDecls(const ValueDecl *VD, const FnTy &Fn) {
static void walkRelatedDecls(const ValueDecl *VD, const FnTy &Fn) {
if (isa<ParamDecl>(VD))
return; // Parameters don't have interesting related declarations.
@@ -834,7 +834,11 @@ static bool passCursorInfoForDecl(SourceFile* SF,
}
unsigned DeclEnd = SS.size();
SmallVector<symbolgraphgen::PathComponent, 4> PathComponents;
SmallVector<ParentInfo, 4> Parents;
unsigned SymbolGraphBegin = SS.size();
unsigned SymbolGraphEnd = SymbolGraphBegin;
if (SymbolGraph) {
symbolgraphgen::SymbolGraphOptions Options {
"",
@@ -845,10 +849,18 @@ static bool passCursorInfoForDecl(SourceFile* SF,
};
llvm::raw_svector_ostream OS(SS);
symbolgraphgen::printSymbolGraphForDecl(VD, BaseType,
InSynthesizedExtension,
Options, OS);
InSynthesizedExtension, Options, OS,
PathComponents);
SymbolGraphEnd = SS.size();
for (auto &Component: PathComponents) {
unsigned USRStart = SS.size();
if (SwiftLangSupport::printUSR(Component.VD, OS))
continue;
StringRef USR{SS.begin()+USRStart, SS.size() - USRStart};
Parents.push_back({Component.Title, Component.Kind, USR});
}
}
unsigned SymbolGraphEnd = SS.size();
unsigned FullDeclBegin = SS.size();
{
@@ -1043,6 +1055,7 @@ static bool passCursorInfoForDecl(SourceFile* SF,
Info.AvailableActions = llvm::makeArrayRef(RefactoringInfoBuffer);
Info.ParentNameOffset = getParamParentNameOffset(VD, CursorLoc);
Info.SymbolGraph = SymbolGraphJSON;
Info.ParentContexts = llvm::makeArrayRef(Parents);
Receiver(RequestResult<CursorInfoData>::fromResult(Info));
return true;
}