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

[IDE] Handle annotation of clang submodule imports properly.

Browse Source 
rdar://17780613

Swift SVN r20595
This commit is contained in:
Argyrios Kyrtzidis
2014-07-26 20:58:19 +00:00
parent c2dee83422
commit 3175251bb1
8 changed files with 147 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -11,6 +11,7 @@
//===----------------------------------------------------------------------===//
#include "swift/IDE/ModuleInterfacePrinting.h"
#include "swift/IDE/Utils.h"
#include "swift/AST/ASTContext.h"
#include "swift/AST/ASTPrinter.h"
#include "swift/AST/Decl.h"
@@ -94,22 +95,6 @@ private:
};
} // unnamed namespace
static const clang::Module *findTopLevelClangModule(const Module *M) {
const ClangModuleUnit *CMU = nullptr;
for (auto *FU : M->getFiles()) {
if ((CMU = dyn_cast<ClangModuleUnit>(FU)))
break;
if (auto *AST = dyn_cast<SerializedASTFile>(FU)) {
if (auto *ShadowedModule = AST->getFile().getShadowedModule())
if (auto *Result = findTopLevelClangModule(ShadowedModule))
return Result;
}
}
if (!CMU)
return nullptr;
return CMU->getClangModule();
}
void swift::ide::printModuleInterface(Module *M,
ModuleTraversalOptions TraversalOptions,
ASTPrinter &Printer,
@@ -154,7 +139,7 @@ void swift::ide::printSubmoduleInterface(
// Drop top-level module name.
FullModuleName = FullModuleName.slice(1);
InterestingClangModule = findTopLevelClangModule(M);
InterestingClangModule = findUnderlyingClangModule(M);
if (InterestingClangModule) {
for (StringRef Name : FullModuleName) {
InterestingClangModule = InterestingClangModule->findSubmodule(Name);