[ASTScope] Rename and generalize AttachedPropertyWrapperScope to CustomAttributeScope

so that it can represent the scope for any custom attribute and its arguments.

This commit is NFC, but CustomAttributeScope is now applicable to attached macros.

Author: hborla

include/swift/AST/ASTScope.h

@@ -840,24 +840,20 @@ class DefaultArgumentInitializerScope final : public ASTScopeImpl {
   bool ignoreInDebugInfo() const override { return true; }
 };
 
-/// Consider:
-///  @_propertyWrapper
-///  struct WrapperWithInitialValue {
-///  }
-///  struct HasWrapper {
-///    @WrapperWithInitialValue var y = 17
-///  }
-/// Lookup has to be able to find the use of WrapperWithInitialValue, that's
-/// what this scope is for. Because the source positions are screwy.
-
-class AttachedPropertyWrapperScope final : public ASTScopeImpl {
+/// The scope for custom attributes and their arguments, such as for
+/// attached property wrappers and for attached macros.
+///
+/// Source locations for the attribute name and its arguments are in the
+/// custom attribute, so lookup is invoked from within the attribute
+/// itself.
+class CustomAttributeScope final : public ASTScopeImpl {
 public:
   CustomAttr *attr;
-  VarDecl *decl;
+  ValueDecl *decl;
 
-  AttachedPropertyWrapperScope(CustomAttr *attr, VarDecl *decl)
+  CustomAttributeScope(CustomAttr *attr, ValueDecl *decl)
       : attr(attr), decl(decl) {}
-  virtual ~AttachedPropertyWrapperScope() {}
+  virtual ~CustomAttributeScope() {}
 
 protected:
   ASTScopeImpl *expandSpecifically(ScopeCreator &) override;

lib/AST/ASTScope.cpp

@@ -138,7 +138,7 @@ DEFINE_GET_CLASS_NAME(AbstractFunctionDeclScope)
 DEFINE_GET_CLASS_NAME(ParameterListScope)
 DEFINE_GET_CLASS_NAME(FunctionBodyScope)
 DEFINE_GET_CLASS_NAME(DefaultArgumentInitializerScope)
-DEFINE_GET_CLASS_NAME(AttachedPropertyWrapperScope)
+DEFINE_GET_CLASS_NAME(CustomAttributeScope)
 DEFINE_GET_CLASS_NAME(PatternEntryDeclScope)
 DEFINE_GET_CLASS_NAME(PatternEntryInitializerScope)
 DEFINE_GET_CLASS_NAME(ConditionalClausePatternUseScope)

lib/AST/ASTScopeCreation.cpp

@@ -602,7 +602,7 @@ void ScopeCreator::addChildrenForKnownAttributes(ValueDecl *decl,
       }
     } else if (auto *customAttr = dyn_cast<CustomAttr>(attr)) {
       if (auto *vd = dyn_cast<VarDecl>(decl)) {
-        constructExpandAndInsert<AttachedPropertyWrapperScope>(
+        constructExpandAndInsert<CustomAttributeScope>(
             parent, customAttr, vd);
       }
     }
@@ -716,7 +716,7 @@ CREATES_NEW_INSERTION_POINT(ConditionalClausePatternUseScope)
 
 NO_NEW_INSERTION_POINT(FunctionBodyScope)
 NO_NEW_INSERTION_POINT(AbstractFunctionDeclScope)
-NO_NEW_INSERTION_POINT(AttachedPropertyWrapperScope)
+NO_NEW_INSERTION_POINT(CustomAttributeScope)
 NO_NEW_INSERTION_POINT(EnumElementScope)
 NO_NEW_INSERTION_POINT(GuardStmtBodyScope)
 NO_NEW_INSERTION_POINT(ParameterListScope)
@@ -1177,7 +1177,7 @@ void DefaultArgumentInitializerScope::
   scopeCreator.addToScopeTree(initExpr, this);
 }
 
-void AttachedPropertyWrapperScope::
+void CustomAttributeScope::
     expandAScopeThatDoesNotCreateANewInsertionPoint(
         ScopeCreator &scopeCreator) {
   if (auto *args = attr->getArgs()) {

lib/AST/ASTScopeSourceRange.cpp

@@ -360,7 +360,7 @@ SourceRange ClosureParametersScope::getSourceRangeOfThisASTNode(
   return explicitClosureExpr->getSourceRange();
 }
 
-SourceRange AttachedPropertyWrapperScope::getSourceRangeOfThisASTNode(
+SourceRange CustomAttributeScope::getSourceRangeOfThisASTNode(
     const bool omitAssertions) const {
   return attr->getRange();
 }