[Macros] Use the singular 'memberAttribute' spelling for attached member

attribute macros.

Author: hborla

lib/AST/Decl.cpp

@@ -9722,7 +9722,7 @@ StringRef swift::getMacroRoleString(MacroRole role) {
     return "accessor";
 
   case MacroRole::MemberAttribute:
-    return "memberAttributes";
+    return "memberAttribute";
 
   case MacroRole::Member:
     return "member";

lib/Parse/ParseDecl.cpp

@@ -2192,7 +2192,7 @@ static Optional<MacroRole> getMacroRole(
       .Case("declaration", MacroRole::Declaration)
       .Case("expression", MacroRole::Expression)
       .Case("accessor", MacroRole::Accessor)
-      .Case("memberAttributes", MacroRole::MemberAttribute)
+      .Case("memberAttribute", MacroRole::MemberAttribute)
       .Case("member", MacroRole::Member)
       .Default(None);
 

test/Macros/composed_macro.swift

@@ -9,7 +9,7 @@
 // FIXME: Swift parser is not enabled on Linux CI yet.
 // REQUIRES: OS=macosx
 
-@attached(memberAttributes)
+@attached(memberAttribute)
 @attached(member)
 macro myTypeWrapper() = #externalMacro(module: "MacroDefinition", type: "TypeWrapperMacro")
 @attached(accessor) macro accessViaStorage() = #externalMacro(module: "MacroDefinition", type: "AccessViaStorageMacro")

test/Macros/macro_expand_attributes.swift

@@ -9,7 +9,7 @@
 // FIXME: Swift parser is not enabled on Linux CI yet.
 // REQUIRES: OS=macosx
 
-@attached(memberAttributes) macro wrapAllProperties() = #externalMacro(module: "MacroDefinition", type: "WrapAllProperties")
+@attached(memberAttribute) macro wrapAllProperties() = #externalMacro(module: "MacroDefinition", type: "WrapAllProperties")
 
 @propertyWrapper
 struct Wrapper<T> {

test/Serialization/Inputs/def_macros.swift

@@ -4,7 +4,7 @@
 
 @attached(accessor) public macro myWrapper() = #externalMacro(module: "MacroDefinition", type: "MyWrapperMacro")
 
-@attached(memberAttributes) public macro wrapAllProperties() = #externalMacro(module: "MacroDefinition", type: "WrapAllProperties")
+@attached(memberAttribute) public macro wrapAllProperties() = #externalMacro(module: "MacroDefinition", type: "WrapAllProperties")
 
 // Make sure that macro custom attributes are not serialized.
 @wrapAllProperties