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

[InterfacePrinting] Print missing import decls from Swift module instance. rdar://20695897

Browse Source 
Swift SVN r30588
This commit is contained in:
Xi Ge
2015-07-24 20:44:21 +00:00
parent 6a27182712
commit af589ebaa7
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -201,6 +201,17 @@ void swift::ide::printSubmoduleInterface(
}
}
// Collect those submodules that are actually imported but have no import decls
// in the module.
llvm::SmallPtrSet<const clang::Module *, 16> NoImportSubModules;
if (InterestingClangModule) {
// Assume all submodules are missing.
for (auto It =InterestingClangModule->submodule_begin();
It != InterestingClangModule->submodule_end(); It ++) {
NoImportSubModules.insert(*It);
}
}
// Separate the declarations that we are going to print into different
// buckets.
for (Decl *D : Decls) {
@@ -233,6 +244,9 @@ void swift::ide::printSubmoduleInterface(
if (auto ID = dyn_cast<ImportDecl>(D)) {
if (ShouldPrintImport(ID)) {
if (ID->getClangModule())
// Erase those submodules that are not missing.
NoImportSubModules.erase(ID->getClangModule());
if (ID->getImportKind() == ImportKind::Module) {
// Make sure we don't print duplicate imports, due to getting imports
// for both a clang module and its overlay.
@@ -270,6 +284,11 @@ void swift::ide::printSubmoduleInterface(
}
}
// Create the missing import decls and add to the collector.
for (auto *SM : NoImportSubModules) {
ImportDecls.push_back(createImportDecl(M->getASTContext(), M, SM, {}));
}
auto &ClangSourceManager = Importer.getClangASTContext().getSourceManager();
// Sort imported declarations in source order *within a submodule*.