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/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2023-10-11 22:34:43 -07:00
parent c1bb2a4d89 9ba500d4e4
commit 93ba352fec
32 changed files with 175 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Sema/ImportResolution.cpp
View File

@@ -821,14 +821,21 @@ void UnboundImport::validateResilience(NullablePtr<ModuleDecl> topLevelModule,
topLevelModule.get()->getName(),
SF.getParentModule()->getName());
if (ctx.LangOpts.hasFeature(Feature::AccessLevelOnImport)) {
if (ctx.LangOpts.hasFeature(Feature::InternalImportsByDefault)) {
// This will catch Swift 6 language mode as well where
// it will be reported as an error.
inFlight.fixItRemove(import.accessLevelRange);
} else {
SourceRange attrRange = import.accessLevelRange;
if (attrRange.isValid())
inFlight.fixItReplace(attrRange, "internal");
else
inFlight.fixItInsert(import.importLoc, "internal ");
} else {
inFlight.limitBehavior(DiagnosticBehavior::Warning);
// Downgrade to warning only in pre-Swift 6 mode and
// when not using the experimental flag.
if (!ctx.LangOpts.hasFeature(Feature::AccessLevelOnImport))
inFlight.limitBehavior(DiagnosticBehavior::Warning);
}
}