[Sema] Track the access level modifier on import full range

Author: xymus

include/swift/AST/Import.h

@@ -591,19 +591,19 @@ struct AttributedImport {
 
   /// Location of the attribute that defined \c accessLevel. Also indicates
   /// if the access level was implicit or explicit.
-  SourceLoc accessLevelLoc;
+  SourceRange accessLevelRange;
 
   AttributedImport(ModuleInfo module, SourceLoc importLoc = SourceLoc(),
                    ImportOptions options = ImportOptions(),
                    StringRef filename = {}, ArrayRef<Identifier> spiGroups = {},
                    SourceRange preconcurrencyRange = {},
                    llvm::Optional<AccessLevel> docVisibility = llvm::None,
                    AccessLevel accessLevel = AccessLevel::Public,
-                   SourceLoc accessLevelLoc = SourceLoc())
+                   SourceRange accessLevelRange = SourceRange())
       : module(module), importLoc(importLoc), options(options),
         sourceFileArg(filename), spiGroups(spiGroups),
         preconcurrencyRange(preconcurrencyRange), docVisibility(docVisibility),
-        accessLevel(accessLevel), accessLevelLoc(accessLevelLoc) {
+        accessLevel(accessLevel), accessLevelRange(accessLevelRange) {
     assert(!(options.contains(ImportFlags::Exported) &&
              options.contains(ImportFlags::ImplementationOnly)) ||
            options.contains(ImportFlags::Reserved));
@@ -614,7 +614,7 @@ struct AttributedImport {
     : AttributedImport(module, other.importLoc, other.options,
                        other.sourceFileArg, other.spiGroups,
                        other.preconcurrencyRange, other.docVisibility,
-                       other.accessLevel, other.accessLevelLoc) { }
+                       other.accessLevel, other.accessLevelRange) { }
 
   friend bool operator==(const AttributedImport<ModuleInfo> &lhs,
                          const AttributedImport<ModuleInfo> &rhs) {
@@ -624,7 +624,7 @@ struct AttributedImport {
            lhs.spiGroups == rhs.spiGroups &&
            lhs.docVisibility == rhs.docVisibility &&
            lhs.accessLevel == rhs.accessLevel &&
-           lhs.accessLevelLoc == rhs.accessLevelLoc;
+           lhs.accessLevelRange == rhs.accessLevelRange;
   }
 
   AttributedImport<ImportedModule> getLoaded(ModuleDecl *loadedModule) const {
@@ -802,7 +802,7 @@ struct DenseMapInfo<swift::AttributedImport<ModuleInfo>> {
            a.spiGroups == b.spiGroups &&
            a.docVisibility == b.docVisibility &&
            a.accessLevel == b.accessLevel &&
-           a.accessLevelLoc == b.accessLevelLoc;
+           a.accessLevelRange == b.accessLevelRange;
   }
 };
 }

lib/Sema/ImportResolution.cpp

@@ -570,7 +570,7 @@ UnboundImport::UnboundImport(ImportDecl *ID)
 
   import.accessLevel = ID->getAccessLevel();
   if (auto attr = ID->getAttrs().getAttribute<AccessControlAttr>()) {
-    import.accessLevelLoc = attr->getLocation();
+    import.accessLevelRange = attr->getLocation();
   }
 
   if (ID->getAttrs().hasAttribute<SPIOnlyAttr>())
@@ -822,9 +822,9 @@ void UnboundImport::validateResilience(NullablePtr<ModuleDecl> topLevelModule,
                                      SF.getParentModule()->getName());
 
   if (ctx.LangOpts.hasFeature(Feature::AccessLevelOnImport)) {
-    SourceLoc attrLoc = import.accessLevelLoc;
-    if (attrLoc.isValid())
-      inFlight.fixItReplace(attrLoc, "internal");
+    SourceRange attrRange = import.accessLevelRange;
+    if (attrRange.isValid())
+      inFlight.fixItReplace(attrRange, "internal");
     else
       inFlight.fixItInsert(import.importLoc, "internal ");
   } else {

lib/Sema/ResilienceDiagnostics.cpp

@@ -115,7 +115,7 @@ bool TypeChecker::diagnoseInlinableDeclRefAccess(SourceLoc loc,
   ImportAccessLevel problematicImport = D->getImportAccessFrom(DC);
   if (problematicImport.has_value() &&
       problematicImport->accessLevel < D->getFormalAccess()) {
-    Context.Diags.diagnose(problematicImport->accessLevelLoc,
+    Context.Diags.diagnose(problematicImport->importLoc,
                            diag::decl_import_via_here, D,
                            problematicImport->accessLevel,
                            problematicImport->module.importedModule);

lib/Sema/TypeCheckAccess.cpp

@@ -339,13 +339,13 @@ static void noteLimitingImport(ASTContext &ctx,
 
   if (auto ITR = dyn_cast_or_null<IdentTypeRepr>(complainRepr)) {
     ValueDecl *VD = ITR->getBoundDecl();
-    ctx.Diags.diagnose(limitImport->accessLevelLoc,
+    ctx.Diags.diagnose(limitImport->importLoc,
                        diag::decl_import_via_here,
                        VD,
                        limitImport->accessLevel,
                        limitImport->module.importedModule);
   } else {
-    ctx.Diags.diagnose(limitImport->accessLevelLoc, diag::module_imported_here,
+    ctx.Diags.diagnose(limitImport->importLoc, diag::module_imported_here,
                        limitImport->module.importedModule,
                        limitImport->accessLevel);
   }