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

[sourcekitd] When searching for a clang decl, look at overrides

Browse Source 
Allows us to do name-transation on an override of a clang decl.

rdar://problem/32187817
This commit is contained in:
Ben Langmuir
2017-05-14 14:40:42 -07:00
parent fb5734c24f
commit c89d024cd2
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -990,23 +990,29 @@ static bool passNameInfoForDecl(const ValueDecl *VD, NameTranslatingInfo &Info,
ClangImporter *Importer = static_cast<ClangImporter *>(VD->getDeclContext()->
getASTContext().getClangModuleLoader());
if (auto *Named = dyn_cast_or_null<clang::NamedDecl>(VD->getClangDecl())) {
auto ObjCName = getClangDeclarationName(Named, Info);
if (!ObjCName)
return true;
DeclName Name = Importer->importName(Named, ObjCName);
NameTranslatingInfo Result;
Result.NameKind = SwiftLangSupport::getUIDForNameKind(NameKind::Swift);
Result.BaseName = Name.getBaseName().str();
std::transform(Name.getArgumentNames().begin(),
Name.getArgumentNames().end(),
std::back_inserter(Result.ArgNames),
[](Identifier Id) { return Id.str(); });
Receiver(Result);
return false;
const clang::NamedDecl *Named = nullptr;
auto *BaseDecl = VD;
while (!Named && BaseDecl) {
Named = dyn_cast_or_null<clang::NamedDecl>(BaseDecl->getClangDecl());
BaseDecl = BaseDecl->getOverriddenDecl();
}
return true;
if (!Named)
return true;
auto ObjCName = getClangDeclarationName(Named, Info);
if (!ObjCName)
return true;
DeclName Name = Importer->importName(Named, ObjCName);
NameTranslatingInfo Result;
Result.NameKind = SwiftLangSupport::getUIDForNameKind(NameKind::Swift);
Result.BaseName = Name.getBaseName().str();
std::transform(Name.getArgumentNames().begin(),
Name.getArgumentNames().end(),
std::back_inserter(Result.ArgNames),
[](Identifier Id) { return Id.str(); });
Receiver(Result);
return false;
}
}
}