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] Cursor info: for extension decls, the cursor info query always returns the extended nominal's group name.

Browse Source
This commit is contained in:
Xi Ge
2016-03-02 16:10:25 -08:00
parent 3f20eb242d
commit 65a3aade7e
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
#include "swift/IDE/SourceEntityWalker.h"
#include "swift/IDE/CommentConversion.h"
#include "swift/IDE/ModuleInterfacePrinting.h"
#include "swift/IDE/Utils.h"
#include "swift/Markup/XMLUtils.h"
#include "swift/Sema/IDETypeChecking.h"
@@ -485,6 +486,19 @@ static bool passCursorInfoForDecl(const ValueDecl *VD,
SmallString<64> SS;
auto BaseType = findBaseTypeForReplacingArchetype(VD, Ty);
bool InSynthesizedExtension = false;
if (BaseType) {
if(auto Target = BaseType->getAnyNominal()) {
if(auto Ext = dyn_cast_or_null<ExtensionDecl>(VD->getDeclContext()->
getInnermostTypeContext())) {
llvm::SmallPtrSet<ExtensionDecl*, 15> Exts;
SynthesizedExtensionAnalyzer Analyzer(Target);
Analyzer.findSynthesizedExtensions(Exts);
InSynthesizedExtension = Exts.count(Ext) != 0;
}
}
}
unsigned NameBegin = SS.size();
{
llvm::raw_svector_ostream OS(SS);
@@ -496,11 +510,9 @@ static bool passCursorInfoForDecl(const ValueDecl *VD,
{
llvm::raw_svector_ostream OS(SS);
SwiftLangSupport::printUSR(VD, OS);
if (BaseType){
if(auto Target = BaseType->getAnyNominal()) {
if (InSynthesizedExtension) {
OS << LangSupport::SynthesizedUSRSeparator;
SwiftLangSupport::printUSR(Target, OS);
}
SwiftLangSupport::printUSR(BaseType->getAnyNominal(), OS);
}
}
unsigned USREnd = SS.size();
@@ -536,7 +548,8 @@ static bool passCursorInfoForDecl(const ValueDecl *VD,
unsigned GroupBegin = SS.size();
{
llvm::raw_svector_ostream OS(SS);
if (auto OP = VD->getGroupName())
auto *GroupVD = InSynthesizedExtension ? BaseType->getAnyNominal() : VD;
if (auto OP = GroupVD->getGroupName())
OS << OP.getValue();
}
unsigned GroupEnd = SS.size();