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

Converting ModuleDecl::ImportedModule from std::pair to a dedicated struct. (#31360)

Browse Source
This commit is contained in:
Daniel Sweeney
2020-04-30 21:26:03 -06:00
committed by GitHub
parent f503a2d58a
commit ea526c6383
25 changed files with 211 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp
View File

@@ -350,9 +350,9 @@ ImportDepth::ImportDepth(ASTContext &context,
main->getImportedModules(mainImports, importFilter);
for (auto &import : mainImports) {
uint8_t depth = 1;
if (auxImports.count(import.second->getName().str()))
if (auxImports.count(import.importedModule->getName().str()))
depth = 0;
worklist.emplace_back(import.second, depth);
worklist.emplace_back(import.importedModule, depth);
}
// Fill depths with BFS over module imports.
@@ -380,10 +380,11 @@ ImportDepth::ImportDepth(ASTContext &context,
uint8_t next = std::max(depth, uint8_t(depth + 1)); // unsigned wrap
// Implicitly imported sub-modules get the same depth as their parent.
if (const clang::Module *CMI = import.second->findUnderlyingClangModule())
if (const clang::Module *CMI =
import.importedModule->findUnderlyingClangModule())
if (CM && CMI->isSubModuleOf(CM))
next = depth;
worklist.emplace_back(import.second, next);
worklist.emplace_back(import.importedModule, next);
}
}
}