Rename traits 'Attributed' to 'WithAttributes', introduce 'WithModifiers'

Author: rintaro

CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift

@@ -147,7 +147,8 @@ public let COMMON_NODES: [Node] = [
     description: "In case the source code is missing a declaration, this node stands in place of the missing declaration.",
     kind: "Decl",
     traits: [
-      "Attributed"
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -66,7 +66,7 @@ public let DECL_NODES: [Node] = [
     nameForDiagnostics: "accessor",
     kind: "Decl",
     traits: [
-      "Attributed"
+      "WithAttributes"
     ],
     parserFunction: "parseAccessorDecl",
     children: [
@@ -151,7 +151,8 @@ public let DECL_NODES: [Node] = [
     traits: [
       "DeclGroup",
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -235,7 +236,8 @@ public let DECL_NODES: [Node] = [
     kind: "Decl",
     traits: [
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -322,7 +324,8 @@ public let DECL_NODES: [Node] = [
     traits: [
       "DeclGroup",
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -469,7 +472,8 @@ public let DECL_NODES: [Node] = [
       """,
     kind: "Decl",
     traits: [
-      "Attributed"
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -577,7 +581,8 @@ public let DECL_NODES: [Node] = [
     nameForDiagnostics: "parameter",
     kind: "Syntax",
     traits: [
-      "WithTrailingComma"
+      "WithTrailingComma",
+      "WithModifiers",
     ],
     parserFunction: "parseEnumCaseParameter",
     children: [
@@ -631,7 +636,8 @@ public let DECL_NODES: [Node] = [
     description: "A `case` declaration of a Swift `enum`. It can have 1 or more `EnumCaseElement`s inside, each declaring a different case of the enum.",
     kind: "Decl",
     traits: [
-      "Attributed"
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -714,7 +720,8 @@ public let DECL_NODES: [Node] = [
     traits: [
       "DeclGroup",
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -782,7 +789,8 @@ public let DECL_NODES: [Node] = [
     kind: "Decl",
     traits: [
       "DeclGroup",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -830,7 +838,8 @@ public let DECL_NODES: [Node] = [
     kind: "Decl",
     traits: [
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -894,7 +903,8 @@ public let DECL_NODES: [Node] = [
     kind: "Syntax",
     traits: [
       "WithTrailingComma",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     parserFunction: "parseFunctionParameter",
     children: [
@@ -1062,7 +1072,8 @@ public let DECL_NODES: [Node] = [
       """,
     kind: "Decl",
     traits: [
-      "Attributed"
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -1157,7 +1168,8 @@ public let DECL_NODES: [Node] = [
       """,
     kind: "Decl",
     traits: [
-      "Attributed"
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -1220,7 +1232,8 @@ public let DECL_NODES: [Node] = [
     kind: "Decl",
     traits: [
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -1275,7 +1288,9 @@ public let DECL_NODES: [Node] = [
     nameForDiagnostics: "macro expansion",
     kind: "Decl",
     traits: [
-      "FreestandingMacroExpansion"
+      "FreestandingMacroExpansion",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -1426,7 +1441,8 @@ public let DECL_NODES: [Node] = [
     kind: "Decl",
     traits: [
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -1702,7 +1718,8 @@ public let DECL_NODES: [Node] = [
     kind: "Decl",
     traits: [
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -1813,7 +1830,8 @@ public let DECL_NODES: [Node] = [
     traits: [
       "DeclGroup",
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -1980,7 +1998,8 @@ public let DECL_NODES: [Node] = [
     traits: [
       "DeclGroup",
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -2041,7 +2060,8 @@ public let DECL_NODES: [Node] = [
     nameForDiagnostics: "subscript",
     kind: "Decl",
     traits: [
-      "Attributed"
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(
@@ -2142,7 +2162,7 @@ public let DECL_NODES: [Node] = [
     kind: "Decl",
     traits: [
       "IdentifiedDecl",
-      "Attributed",
+      "WithAttributes",
     ],
     children: [
       Child(
@@ -2189,7 +2209,8 @@ public let DECL_NODES: [Node] = [
     nameForDiagnostics: "variable",
     kind: "Decl",
     traits: [
-      "Attributed"
+      "WithAttributes",
+      "WithModifiers",
     ],
     children: [
       Child(

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -360,7 +360,9 @@ public let EXPR_NODES: [Node] = [
     nameForDiagnostics: "parameter",
     kind: "Syntax",
     traits: [
-      "WithTrailingComma"
+      "WithTrailingComma",
+      "WithAttributes",
+      "WithModifiers",
     ],
     parserFunction: "parseClosureParameter",
     children: [
@@ -515,7 +517,7 @@ public let EXPR_NODES: [Node] = [
     nameForDiagnostics: "closure signature",
     kind: "Syntax",
     traits: [
-      "Attributed"
+      "WithAttributes"
     ],
     children: [
       Child(

CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift

@@ -75,7 +75,7 @@ public let GENERIC_NODES: [Node] = [
     kind: "Syntax",
     traits: [
       "WithTrailingComma",
-      "Attributed",
+      "WithAttributes",
     ],
     children: [
       Child(

CodeGeneration/Sources/SyntaxSupport/Traits.swift

@@ -23,12 +23,6 @@ public class Trait {
 }
 
 public let TRAITS: [Trait] = [
-  Trait(
-    traitName: "Attributed",
-    children: [
-      Child(name: "Attributes", kind: .node(kind: "AttributeList"), isOptional: true)
-    ]
-  ),
   Trait(
     traitName: "Braced",
     children: [
@@ -80,12 +74,24 @@ public let TRAITS: [Trait] = [
       Child(name: "RightParen", kind: .token(choices: [.token(tokenKind: "RightParenToken")])),
     ]
   ),
+  Trait(
+    traitName: "WithAttributes",
+    children: [
+      Child(name: "Attributes", kind: .node(kind: "AttributeList"), isOptional: true)
+    ]
+  ),
   Trait(
     traitName: "WithCodeBlock",
     children: [
       Child(name: "Body", kind: .node(kind: "CodeBlock"))
     ]
   ),
+  Trait(
+    traitName: "WithModifiers",
+    children: [
+      Child(name: "Modifiers", kind: .node(kind: "ModifierList"), isOptional: true)
+    ]
+  ),
   Trait(
     traitName: "WithStatements",
     children: [

CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift

@@ -39,7 +39,7 @@ public let TYPE_NODES: [Node] = [
     nameForDiagnostics: "type",
     kind: "Type",
     traits: [
-      "Attributed"
+      "WithAttributes"
     ],
     children: [
       Child(

Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md

@@ -362,14 +362,15 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 
 ### Traits
 
-- <doc:SwiftSyntax/Attributed>
 - <doc:SwiftSyntax/Braced>
 - <doc:SwiftSyntax/DeclGroup>
 - <doc:SwiftSyntax/EffectSpecifiers>
 - <doc:SwiftSyntax/FreestandingMacroExpansion>
 - <doc:SwiftSyntax/IdentifiedDecl>
 - <doc:SwiftSyntax/Parenthesized>
+- <doc:SwiftSyntax/WithAttributes>
 - <doc:SwiftSyntax/WithCodeBlock>
+- <doc:SwiftSyntax/WithModifiers>
 - <doc:SwiftSyntax/WithStatements>
 - <doc:SwiftSyntax/WithTrailingComma>
 

Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

@@ -25,3 +25,6 @@ public typealias AccessPathSyntax = ImportPathSyntax
 
 @available(*, deprecated, renamed: "ImportPathComponentSyntax")
 public typealias AccessPathComponentSyntax = ImportPathComponentSyntax
+
+@available(*, deprecated, renamed: "WithAttributesSyntax")
+public typealias AttributedSyntax = WithAttributesSyntax