averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into import-as-member

Browse Source
This commit is contained in:
Michael Ilseman
2016-03-25 15:47:47 -07:00
parent 67d9f95dbc 56673bdaf2
commit b01caa01c6
8 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/IDE/CodeCompletion.cpp
View File

@@ -1610,12 +1610,13 @@ public:
CurrDeclContext->getParentSourceFile()->getImportedModules(Imported,
Module::ImportFilter::All);
while(!Imported.empty()) {
ModuleDecl *MD = Imported.front().second;
Imported.erase(Imported.begin());
ModuleDecl *MD = Imported.back().second;
Imported.pop_back();
if (!ImportedModules.insert(MD->getNameStr()).second)
continue;
FurtherImported.clear();
MD->getImportedModules(FurtherImported, Module::ImportFilter::Public);
Imported.append(FurtherImported.begin(), FurtherImported.end());
for (auto SubMod : FurtherImported) {
Imported.push_back(SubMod);
}