Rename children that refer to a MemberDeclBlock from members to memberBlock and MemberDeclBlock.members to items

Previously, we frequently had patterns where we did `node.members.members`, which doesn’t read very nice. `node.memberBlock.items` is much nicer.

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -196,7 +196,7 @@ public let DECL_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Members",
+        name: "MemberBlock",
         kind: .node(kind: "MemberDeclBlock")
       ),
     ]
@@ -312,7 +312,7 @@ public let DECL_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Members",
+        name: "MemberBlock",
         kind: .node(kind: "MemberDeclBlock")
       ),
     ]
@@ -654,7 +654,7 @@ public let DECL_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Members",
+        name: "MemberBlock",
         kind: .node(kind: "MemberDeclBlock"),
         description: "The cases and other members of this enum."
       ),
@@ -709,7 +709,7 @@ public let DECL_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Members",
+        name: "MemberBlock",
         kind: .node(kind: "MemberDeclBlock")
       ),
     ]
@@ -1202,7 +1202,7 @@ public let DECL_NODES: [Node] = [
         kind: .token(choices: [.token(tokenKind: "LeftBraceToken")])
       ),
       Child(
-        name: "Members",
+        name: "Items",
         kind: .collection(kind: "MemberDeclList", collectionElementName: "Member"),
         isIndented: true
       ),
@@ -1704,7 +1704,7 @@ public let DECL_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Members",
+        name: "MemberBlock",
         kind: .node(kind: "MemberDeclBlock")
       ),
     ]
@@ -1806,7 +1806,7 @@ public let DECL_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Members",
+        name: "MemberBlock",
         kind: .node(kind: "MemberDeclBlock")
       ),
     ]

CodeGeneration/Sources/SyntaxSupport/Traits.swift

@@ -41,7 +41,7 @@ public let TRAITS: [Trait] = [
     children: [
       Child(name: "Attributes", kind: .node(kind: "AttributeList"), isOptional: true),
       Child(name: "Modifiers", kind: .node(kind: "ModifierList"), isOptional: true),
-      Child(name: "Members", kind: .node(kind: "MemberDeclBlock")),
+      Child(name: "MemberBlock", kind: .node(kind: "MemberDeclBlock")),
     ]
   ),
   Trait(

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -113,7 +113,7 @@ open class BasicFormat: SyntaxRewriter {
       return true
     case \FunctionTypeSyntax.arguments:
       return true
-    case \MemberDeclBlockSyntax.members:
+    case \MemberDeclBlockSyntax.items:
       return true
     case \ParameterClauseSyntax.parameterList:
       return true

Sources/SwiftParser/Declarations.swift

@@ -419,7 +419,7 @@ extension Parser {
     } else {
       whereClause = nil
     }
-    let members = self.parseMemberDeclList(introducer: extensionKeyword)
+    let memberBlock = self.parseMemberDeclList(introducer: extensionKeyword)
     return RawExtensionDeclSyntax(
       attributes: attrs.attributes,
       modifiers: attrs.modifiers,
@@ -428,7 +428,7 @@ extension Parser {
       extendedType: type,
       inheritanceClause: inheritance,
       genericWhereClause: whereClause,
-      members: members,
+      memberBlock: memberBlock,
       arena: self.arena
     )
   }
@@ -857,17 +857,17 @@ extension Parser {
       }
     }
     let (unexpectedBeforeRBrace, rbrace) = self.expectRightBrace(leftBrace: lbrace, introducer: introducer)
-    let members: RawMemberDeclListSyntax
+    let items: RawMemberDeclListSyntax
     if elements.isEmpty && (lbrace.isMissing || rbrace.isMissing) {
-      members = RawMemberDeclListSyntax(elements: [], arena: self.arena)
+      items = RawMemberDeclListSyntax(elements: [], arena: self.arena)
     } else {
-      members = RawMemberDeclListSyntax(elements: elements, arena: self.arena)
+      items = RawMemberDeclListSyntax(elements: elements, arena: self.arena)
     }
 
     return RawMemberDeclBlockSyntax(
       unexpectedBeforeLBrace,
       leftBrace: lbrace,
-      members: members,
+      items: items,
       unexpectedBeforeRBrace,
       rightBrace: rbrace,
       arena: self.arena

Sources/SwiftParser/Nominals.swift

@@ -25,7 +25,7 @@ protocol NominalTypeDeclarationTrait {
     primaryOrGenerics: PrimaryOrGenerics?,
     inheritanceClause: RawTypeInheritanceClauseSyntax?,
     genericWhereClause: RawGenericWhereClauseSyntax?,
-    members: RawMemberDeclBlockSyntax,
+    memberBlock: RawMemberDeclBlockSyntax,
     arena: __shared SyntaxArena
   )
 
@@ -43,10 +43,22 @@ extension RawProtocolDeclSyntax: NominalTypeDeclarationTrait {
     primaryOrGenerics: RawPrimaryAssociatedTypeClauseSyntax?,
     inheritanceClause: RawTypeInheritanceClauseSyntax?,
     genericWhereClause: RawGenericWhereClauseSyntax?,
-    members: RawMemberDeclBlockSyntax,
+    memberBlock: RawMemberDeclBlockSyntax,
     arena: __shared SyntaxArena
   ) {
-    self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, protocolKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, primaryAssociatedTypeClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
+    self.init(
+      attributes: attributes,
+      modifiers: modifiers,
+      unexpectedBeforeIntroducerKeyword,
+      protocolKeyword: introducerKeyword,
+      unexpectedBeforeIdentifier,
+      identifier: identifier,
+      primaryAssociatedTypeClause: primaryOrGenerics,
+      inheritanceClause: inheritanceClause,
+      genericWhereClause: genericWhereClause,
+      memberBlock: memberBlock,
+      arena: arena
+    )
   }
 
   static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawPrimaryAssociatedTypeClauseSyntax? {
@@ -65,10 +77,22 @@ extension RawClassDeclSyntax: NominalTypeDeclarationTrait {
     primaryOrGenerics: RawGenericParameterClauseSyntax?,
     inheritanceClause: RawTypeInheritanceClauseSyntax?,
     genericWhereClause: RawGenericWhereClauseSyntax?,
-    members: RawMemberDeclBlockSyntax,
+    memberBlock: RawMemberDeclBlockSyntax,
     arena: __shared SyntaxArena
   ) {
-    self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, classKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameterClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
+    self.init(
+      attributes: attributes,
+      modifiers: modifiers,
+      unexpectedBeforeIntroducerKeyword,
+      classKeyword: introducerKeyword,
+      unexpectedBeforeIdentifier,
+      identifier: identifier,
+      genericParameterClause: primaryOrGenerics,
+      inheritanceClause: inheritanceClause,
+      genericWhereClause: genericWhereClause,
+      memberBlock: memberBlock,
+      arena: arena
+    )
   }
 
   static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
@@ -87,10 +111,22 @@ extension RawActorDeclSyntax: NominalTypeDeclarationTrait {
     primaryOrGenerics: RawGenericParameterClauseSyntax?,
     inheritanceClause: RawTypeInheritanceClauseSyntax?,
     genericWhereClause: RawGenericWhereClauseSyntax?,
-    members: RawMemberDeclBlockSyntax,
+    memberBlock: RawMemberDeclBlockSyntax,
     arena: __shared SyntaxArena
   ) {
-    self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, actorKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameterClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
+    self.init(
+      attributes: attributes,
+      modifiers: modifiers,
+      unexpectedBeforeIntroducerKeyword,
+      actorKeyword: introducerKeyword,
+      unexpectedBeforeIdentifier,
+      identifier: identifier,
+      genericParameterClause: primaryOrGenerics,
+      inheritanceClause: inheritanceClause,
+      genericWhereClause: genericWhereClause,
+      memberBlock: memberBlock,
+      arena: arena
+    )
   }
 
   static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
@@ -109,10 +145,22 @@ extension RawStructDeclSyntax: NominalTypeDeclarationTrait {
     primaryOrGenerics: RawGenericParameterClauseSyntax?,
     inheritanceClause: RawTypeInheritanceClauseSyntax?,
     genericWhereClause: RawGenericWhereClauseSyntax?,
-    members: RawMemberDeclBlockSyntax,
+    memberBlock: RawMemberDeclBlockSyntax,
     arena: __shared SyntaxArena
   ) {
-    self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, structKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameterClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
+    self.init(
+      attributes: attributes,
+      modifiers: modifiers,
+      unexpectedBeforeIntroducerKeyword,
+      structKeyword: introducerKeyword,
+      unexpectedBeforeIdentifier,
+      identifier: identifier,
+      genericParameterClause: primaryOrGenerics,
+      inheritanceClause: inheritanceClause,
+      genericWhereClause: genericWhereClause,
+      memberBlock: memberBlock,
+      arena: arena
+    )
   }
 
   static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
@@ -131,10 +179,22 @@ extension RawEnumDeclSyntax: NominalTypeDeclarationTrait {
     primaryOrGenerics: RawGenericParameterClauseSyntax?,
     inheritanceClause: RawTypeInheritanceClauseSyntax?,
     genericWhereClause: RawGenericWhereClauseSyntax?,
-    members: RawMemberDeclBlockSyntax,
+    memberBlock: RawMemberDeclBlockSyntax,
     arena: __shared SyntaxArena
   ) {
-    self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, enumKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameters: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
+    self.init(
+      attributes: attributes,
+      modifiers: modifiers,
+      unexpectedBeforeIntroducerKeyword,
+      enumKeyword: introducerKeyword,
+      unexpectedBeforeIdentifier,
+      identifier: identifier,
+      genericParameters: primaryOrGenerics,
+      inheritanceClause: inheritanceClause,
+      genericWhereClause: genericWhereClause,
+      memberBlock: memberBlock,
+      arena: arena
+    )
   }
 
   static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
@@ -162,9 +222,9 @@ extension Parser {
         primaryOrGenerics: nil,
         inheritanceClause: nil,
         genericWhereClause: nil,
-        members: RawMemberDeclBlockSyntax(
+        memberBlock: RawMemberDeclBlockSyntax(
           leftBrace: RawTokenSyntax(missing: .leftBrace, arena: self.arena),
-          members: RawMemberDeclListSyntax(elements: [], arena: self.arena),
+          items: RawMemberDeclListSyntax(elements: [], arena: self.arena),
           rightBrace: RawTokenSyntax(missing: .rightBrace, arena: self.arena),
           arena: self.arena
         ),
@@ -194,7 +254,7 @@ extension Parser {
       whereClause = nil
     }
 
-    let members = self.parseMemberDeclList(introducer: introducerKeyword)
+    let memberBlock = self.parseMemberDeclList(introducer: introducerKeyword)
     return T.init(
       attributes: attrs.attributes,
       modifiers: attrs.modifiers,
@@ -205,7 +265,7 @@ extension Parser {
       primaryOrGenerics: primaryOrGenerics,
       inheritanceClause: inheritance,
       genericWhereClause: whereClause,
-      members: members,
+      memberBlock: memberBlock,
       arena: self.arena
     )
   }

Sources/SwiftParserDiagnostics/PresenceUtils.swift

@@ -78,9 +78,9 @@ class PresentMaker: SyntaxRewriter {
         modifiers: node.modifiers,
         structKeyword: .keyword(.struct, presence: .missing),
         identifier: .identifier("<#declaration#>", leadingTrivia: leadingTriviaBeforePlaceholder),
-        members: MemberDeclBlockSyntax(
+        memberBlock: MemberDeclBlockSyntax(
           leftBrace: .leftBraceToken(presence: .missing),
-          members: MemberDeclListSyntax([]),
+          items: MemberDeclListSyntax([]),
           rightBrace: .rightBraceToken(presence: .missing)
         )
       )

Sources/SwiftSyntax/generated/SyntaxTraits.swift

@@ -102,7 +102,7 @@ public protocol DeclGroupSyntax: SyntaxProtocol {
     set 
   }
 
-  var members: MemberDeclBlockSyntax { 
+  var memberBlock: MemberDeclBlockSyntax { 
     get 
     set 
   }