Make all AttributeListSyntax children non-optional

swiftlang · Aug 9, 2023 · ad6817e · ad6817e
1 parent d1f9b4b
commit ad6817e
Show file tree

Hide file tree

Showing 32 changed files with 428 additions and 430 deletions.
diff --git a/CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift b/CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift
@@ -166,9 +166,8 @@ public let COMMON_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        documentation: "If there were standalone attributes without a declaration to attach them to, the ``MissingDeclSyntax`` will contain these.",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        documentation: "If there were standalone attributes without a declaration to attach them to, the ``MissingDeclSyntax`` will contain these."
       ),
       Child(
         name: "Modifiers",

diff --git a/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift b/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
@@ -84,9 +84,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifier",
@@ -186,9 +185,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",
@@ -275,10 +273,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "Attributes attached to the associated type declaration.",
-        isOptional: true
+        documentation: "Attributes attached to the associated type declaration."
       ),
       Child(
         name: "Modifiers",
@@ -366,10 +363,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "Attributes attached to the class declaration, such as an `@available` attribute.",
-        isOptional: true
+        documentation: "Attributes attached to the class declaration, such as an `@available` attribute."
       ),
       Child(
         name: "Modifiers",
@@ -515,10 +511,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "Attributes that are attached to the deinitializer.",
-        isOptional: true
+        documentation: "Attributes that are attached to the deinitializer."
       ),
       Child(
         name: "Modifiers",
@@ -584,9 +579,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        documentation: "If there were attributes before the editor placeholder, the ``EditorPlaceholderDeclSyntax`` will contain these.",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        documentation: "If there were attributes before the editor placeholder, the ``EditorPlaceholderDeclSyntax`` will contain these."
       ),
       Child(
         name: "Modifiers",
@@ -702,10 +696,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "The attributes applied to the case declaration.",
-        isOptional: true
+        documentation: "The attributes applied to the case declaration."
       ),
       Child(
         name: "Modifiers",
@@ -788,10 +781,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "The attributes applied to the enum declaration.",
-        isOptional: true
+        documentation: "The attributes applied to the enum declaration."
       ),
       Child(
         name: "Modifiers",
@@ -859,9 +851,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",
@@ -909,9 +900,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",
@@ -978,9 +968,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",
@@ -1145,10 +1134,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "Attributes attached to the import declaration, for example `@testable`.",
-        isOptional: true
+        documentation: "Attributes attached to the import declaration, for example `@testable`."
       ),
       Child(
         name: "Modifiers",
@@ -1260,10 +1248,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "Attributes that are attached to the initializer.",
-        isOptional: true
+        documentation: "Attributes that are attached to the initializer."
       ),
       Child(
         name: "Modifiers",
@@ -1328,9 +1315,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",
@@ -1387,9 +1373,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",
@@ -1827,10 +1812,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "The attributes applied to the 'precedencegroup' declaration.",
-        isOptional: true
+        documentation: "The attributes applied to the 'precedencegroup' declaration."
       ),
       Child(
         name: "Modifiers",
@@ -1943,10 +1927,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "Attributes attached to the protocol declaration, such as an `@available` attribute.",
-        isOptional: true
+        documentation: "Attributes attached to the protocol declaration, such as an `@available` attribute."
       ),
       Child(
         name: "Modifiers",
@@ -2114,10 +2097,9 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
         nameForDiagnostics: "attributes",
-        documentation: "Attributes that are attached to the struct declaration.",
-        isOptional: true
+        documentation: "Attributes that are attached to the struct declaration."
       ),
       Child(
         name: "Modifiers",
@@ -2178,9 +2160,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",
@@ -2277,9 +2258,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",
@@ -2333,9 +2313,8 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",

diff --git a/CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift b/CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift
@@ -373,9 +373,8 @@ public let EXPR_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Modifiers",
@@ -525,9 +524,8 @@ public let EXPR_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        nameForDiagnostics: "attributes",
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
+        nameForDiagnostics: "attributes"
       ),
       Child(
         name: "Capture",

diff --git a/CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift b/CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift
@@ -90,8 +90,7 @@ public let GENERIC_NODES: [Node] = [
     children: [
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true)
       ),
       Child(
         name: "EachKeyword",

diff --git a/CodeGeneration/Sources/SyntaxSupport/Traits.swift b/CodeGeneration/Sources/SyntaxSupport/Traits.swift
@@ -37,7 +37,7 @@ public let TRAITS: [Trait] = [
   Trait(
     traitName: "DeclGroup",
     children: [
-      Child(name: "Attributes", kind: .node(kind: .attributeList), isOptional: true),
+      Child(name: "Attributes", kind: .node(kind: .attributeList)),
       Child(name: "Modifiers", kind: .node(kind: .declModifierList)),
       Child(name: "InheritanceClause", kind: .node(kind: .inheritanceClause), isOptional: true),
       Child(
@@ -105,7 +105,7 @@ public let TRAITS: [Trait] = [
   Trait(
     traitName: "WithAttributes",
     children: [
-      Child(name: "Attributes", kind: .node(kind: .attributeList), isOptional: true)
+      Child(name: "Attributes", kind: .node(kind: .attributeList))
     ]
   ),
   Trait(

diff --git a/CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift b/CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift
@@ -60,8 +60,7 @@ public let TYPE_NODES: [Node] = [
       ),
       Child(
         name: "Attributes",
-        kind: .collection(kind: .attributeList, collectionElementName: "Attribute"),
-        isOptional: true
+        kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true)
       ),
       Child(
         name: "BaseType",

diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/ParserEntryFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/ParserEntryFile.swift
@@ -57,7 +57,15 @@ let parserEntryFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
           // The missing item is not necessary to be a declaration,
           // which is just a placeholder here
           return RawCodeBlockItemSyntax(
-            item: .decl(RawDeclSyntax(RawMissingDeclSyntax(attributes: nil, modifiers: self.emptyCollection(RawDeclModifierListSyntax.self), arena: self.arena))),
+            item: .decl(
+              RawDeclSyntax(
+                RawMissingDeclSyntax(
+                  attributes: self.emptyCollection(RawAttributeListSyntax.self),
+                  modifiers: self.emptyCollection(RawDeclModifierListSyntax.self),
+                  arena: self.arena
+                )
+              )
+            ),
             semicolon: nil,
             arena: self.arena
           )

diff --git a/Sources/SwiftParser/Attributes.swift b/Sources/SwiftParser/Attributes.swift
@@ -13,9 +13,9 @@
 @_spi(RawSyntax) import SwiftSyntax
 
 extension Parser {
-  mutating func parseAttributeList() -> RawAttributeListSyntax? {
+  mutating func parseAttributeList() -> RawAttributeListSyntax {
     guard self.at(.atSign, .poundIf) else {
-      return nil
+      return self.emptyCollection(RawAttributeListSyntax.self)
     }
 
     var elements = [RawAttributeListSyntax.Element]()

diff --git a/Sources/SwiftParser/CollectionNodes+Parsable.swift b/Sources/SwiftParser/CollectionNodes+Parsable.swift
@@ -58,7 +58,7 @@ extension AccessorDeclListSyntax: SyntaxParseable {
       return parser.parseAccessorList() ?? RawAccessorDeclListSyntax(elements: [], arena: parser.arena)
     } makeMissing: { remainingTokens, arena in
       return RawAccessorDeclSyntax(
-        attributes: nil,
+        attributes: RawAttributeListSyntax(elements: [], arena: arena),
         modifier: nil,
         accessorSpecifier: RawTokenSyntax(missing: .keyword, text: "get", arena: arena),
         parameters: nil,
@@ -73,8 +73,7 @@ extension AccessorDeclListSyntax: SyntaxParseable {
 extension AttributeListSyntax: SyntaxParseable {
   public static func parse(from parser: inout Parser) -> Self {
     return parse(from: &parser) { parser in
-      let node = parser.parseAttributeList() ?? RawAttributeListSyntax(elements: [], arena: parser.arena)
-      return RawSyntax(node)
+      return RawSyntax(parser.parseAttributeList())
     } makeMissing: { remainingTokens, arena in
       return RawAttributeSyntax(
         atSign: RawTokenSyntax(missing: .atSign, arena: arena),
@@ -106,7 +105,7 @@ extension MemberBlockItemListSyntax: SyntaxParseable {
       return RawSyntax(parser.parseMemberDeclList())
     } makeMissing: { remainingTokens, arena in
       let missingDecl = RawMissingDeclSyntax(
-        attributes: nil,
+        attributes: RawAttributeListSyntax(elements: [], arena: arena),
         modifiers: RawDeclModifierListSyntax(elements: [], arena: arena),
         placeholder: RawTokenSyntax(missing: .identifier, text: "<#declaration#>", arena: arena),
         RawUnexpectedNodesSyntax(remainingTokens, arena: arena),