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

swift-api-digester: ignore synthesized type members from conformed clang protocols.

Browse Source
This commit is contained in:
Xi Ge
2018-04-06 12:27:04 -07:00
parent 369f19d6bc
commit 9042db57b2
5 changed files with 132 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/swift-api-digester/swift-api-digester.cpp
View File

@@ -163,6 +163,10 @@ SwiftVersion("swift-version",
static llvm::cl::opt<bool>
OutputInJson("json", llvm::cl::desc("Print output in JSON format."));
static llvm::cl::opt<bool>
AvoidLocation("avoid-location",
llvm::cl::desc("Avoid serializing the file paths of SDK nodes."));
} // namespace options
namespace {
@@ -1225,6 +1229,9 @@ static StringRef calculateUsr(SDKContext &Ctx, ValueDecl *VD) {
}
static StringRef calculateLocation(SDKContext &SDKCtx, ValueDecl *VD) {
if (options::AvoidLocation) {
return StringRef();
}
auto &Ctx = VD->getASTContext();
auto &Importer = static_cast<ClangImporter &>(*Ctx.getClangModuleLoader());
@@ -1483,7 +1490,7 @@ static SDKNode* constructInitNode(SDKContext &Ctx, ConstructorDecl *CD) {
return Func;
}
static bool shouldIgnore(Decl *D) {
static bool shouldIgnore(Decl *D, const Decl* Parent) {
if (D->isPrivateStdlibDecl(false))
return true;
if (AvailableAttr::isUnavailable(D))
@@ -1518,6 +1525,13 @@ static bool shouldIgnore(Decl *D) {
return true;
if (ClangD->hasAttr<clang::SwiftPrivateAttr>())
return true;
// If this decl is a synthesized member from a conformed clang protocol, we
// should ignore this member to reduce redundancy.
if (Parent &&
!isa<swift::ProtocolDecl>(Parent) &&
isa<clang::ObjCProtocolDecl>(ClangD->getDeclContext()))
return true;
}
return false;
}
@@ -1558,7 +1572,7 @@ static SDKNode *constructTypeAliasNode(SDKContext &Ctx,TypeAliasDecl *TAD) {
static void addMembersToRoot(SDKContext &Ctx, SDKNode *Root,
IterableDeclContext *Context) {
for (auto *Member : Context->getMembers()) {
if (shouldIgnore(Member))
if (shouldIgnore(Member, Context->getDecl()))
continue;
if (auto Func = dyn_cast<FuncDecl>(Member)) {
Root->addChild(constructFunctionNode(Ctx, Func, SDKNodeKind::DeclFunction));
@@ -1648,7 +1662,7 @@ public:
}
void processDecl(ValueDecl *VD) {
if (shouldIgnore(VD))
if (shouldIgnore(VD, nullptr))
return;
if (auto FD = dyn_cast<FuncDecl>(VD)) {