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 master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-06-23 10:39:14 -07:00
parent bbf76203eb 0da060e95e
commit 75bea14185
12 changed files with 65 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,12 +355,11 @@ ImportDepth::ImportDepth(ASTContext &context,
// Private imports from this module.
// FIXME: only the private imports from the current source file.
ModuleDecl::ImportFilter importFilter;
importFilter |= ModuleDecl::ImportFilterKind::Private;
importFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
// FIXME: ImportFilterKind::ShadowedBySeparateOverlay?
SmallVector<ModuleDecl::ImportedModule, 16> mainImports;
main->getImportedModules(mainImports, importFilter);
main->getImportedModules(mainImports,
{ModuleDecl::ImportFilterKind::Private,
ModuleDecl::ImportFilterKind::ImplementationOnly});
for (auto &import : mainImports) {
uint8_t depth = 1;
if (auxImports.count(import.importedModule->getName().str()))

6
tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
View File

@@ -907,9 +907,9 @@ static void collectModuleDependencies(ModuleDecl *TopMod,
auto ClangModuleLoader = TopMod->getASTContext().getClangModuleLoader();
ModuleDecl::ImportFilter ImportFilter;
ImportFilter |= ModuleDecl::ImportFilterKind::Public;
ImportFilter |= ModuleDecl::ImportFilterKind::Private;
ModuleDecl::ImportFilter ImportFilter = {
ModuleDecl::ImportFilterKind::Public,
ModuleDecl::ImportFilterKind::Private};
if (Visited.empty()) {
// Only collect implementation-only dependencies from the main module.
ImportFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;