Improve naming of some more syntax children

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -55,7 +55,8 @@ public let ATTRIBUTE_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Argument",
+        name: "Arguments",
+        deprecatedName: "Argument",
         kind: .nodeChoices(choices: [
           Child(
             name: "ArgumentList",
@@ -456,7 +457,7 @@ public let ATTRIBUTE_NODES: [Node] = [
         kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
       ),
       Child(
-        name: "DiffParams",
+        name: "DifferentiabilityParameters",
         kind: .collection(kind: .differentiabilityParamList, collectionElementName: "DifferentiabilityParam"),
         documentation: "The parameters for differentiation."
       ),
@@ -583,7 +584,8 @@ public let ATTRIBUTE_NODES: [Node] = [
         kind: .token(choices: [.token(tokenKind: "ColonToken")])
       ),
       Child(
-        name: "Declname",
+        name: "DeclName",
+        deprecatedName: "Declname",
         kind: .node(kind: .declName)
       ),
     ]
@@ -863,7 +865,8 @@ public let ATTRIBUTE_NODES: [Node] = [
         documentation: "The colon separating the label and the value"
       ),
       Child(
-        name: "Declname",
+        name: "DeclName",
+        deprecatedName: "Declname",
         kind: .node(kind: .declName),
         nameForDiagnostics: "declaration name",
         documentation: "The value for this argument"

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -1268,7 +1268,8 @@ public let DECL_NODES: [Node] = [
     ],
     children: [
       Child(
-        name: "TypeName",
+        name: "Type",
+        deprecatedName: "TypeName",
         kind: .node(kind: .type)
       ),
       Child(
@@ -1464,7 +1465,8 @@ public let DECL_NODES: [Node] = [
         documentation: "The `#` sign."
       ),
       Child(
-        name: "Macro",
+        name: "MacroName",
+        deprecatedName: "Macro",
         kind: .token(choices: [.token(tokenKind: "IdentifierToken")])
       ),
       Child(
@@ -1698,7 +1700,8 @@ public let DECL_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Accessor",
+        name: "Accessors",
+        deprecatedName: "Accessor",
         kind: .nodeChoices(choices: [
           Child(
             name: "Accessors",
@@ -2257,7 +2260,8 @@ public let DECL_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Accessor",
+        name: "Accessors",
+        deprecatedName: "Accessor",
         kind: .nodeChoices(choices: [
           Child(
             name: "Accessors",

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -107,7 +107,8 @@ public let EXPR_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "TypeName",
+        name: "Type",
+        deprecatedName: "TypeName",
         kind: .node(kind: .type)
       ),
     ]
@@ -996,7 +997,8 @@ public let EXPR_NODES: [Node] = [
         documentation: "The `is` keyword for this expression."
       ),
       Child(
-        name: "TypeName",
+        name: "Type",
+        deprecatedName: "TypeName",
         kind: .node(kind: .type),
         documentation: "The type against which the expression will be checked to see if the expression can be cast to it."
       ),
@@ -1151,7 +1153,8 @@ public let EXPR_NODES: [Node] = [
         documentation: "The `#` sign."
       ),
       Child(
-        name: "Macro",
+        name: "MacroName",
+        deprecatedName: "Macro",
         kind: .token(choices: [.token(tokenKind: "IdentifierToken")])
       ),
       Child(

CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift

@@ -142,7 +142,8 @@ public let GENERIC_NODES: [Node] = [
     ],
     children: [
       Child(
-        name: "Body",
+        name: "Requirement",
+        deprecatedName: "Body",
         kind: .nodeChoices(choices: [
           Child(
             name: "SameTypeRequirement",

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -625,9 +625,11 @@ class ValidateSyntaxNodes: XCTestCase {
   func testNoAbbreviationsInChildNames() {
     var failures: [ValidationFailure] = []
 
+    let abbreviations = ["Args", "Params"]
+
     for node in SYNTAX_NODES.compactMap(\.layoutNode) {
       for child in node.nonUnexpectedChildren {
-        if child.name.contains("Args") {
+        if abbreviations.contains(where: { child.name.contains($0) }) {
           failures.append(
             ValidationFailure(
               node: node.kind,

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -336,7 +336,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "label"
   case \TargetFunctionEntrySyntax.targetLabel:
     return "label"
-  case \TargetFunctionEntrySyntax.declname:
+  case \TargetFunctionEntrySyntax.declName:
     return "declaration name"
   case \TernaryExprSyntax.condition:
     return "condition"

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

@@ -207,12 +207,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenAsKeywordAndQuestionOrExclamationMark"
   case \AsExprSyntax.questionOrExclamationMark:
     return "questionOrExclamationMark"
-  case \AsExprSyntax.unexpectedBetweenQuestionOrExclamationMarkAndTypeName:
-    return "unexpectedBetweenQuestionOrExclamationMarkAndTypeName"
-  case \AsExprSyntax.typeName:
-    return "typeName"
-  case \AsExprSyntax.unexpectedAfterTypeName:
-    return "unexpectedAfterTypeName"
+  case \AsExprSyntax.unexpectedBetweenQuestionOrExclamationMarkAndType:
+    return "unexpectedBetweenQuestionOrExclamationMarkAndType"
+  case \AsExprSyntax.type:
+    return "type"
+  case \AsExprSyntax.unexpectedAfterType:
+    return "unexpectedAfterType"
   case \AssignmentExprSyntax.unexpectedBeforeEqual:
     return "unexpectedBeforeEqual"
   case \AssignmentExprSyntax.equal:
@@ -261,12 +261,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenAttributeNameAndLeftParen"
   case \AttributeSyntax.leftParen:
     return "leftParen"
-  case \AttributeSyntax.unexpectedBetweenLeftParenAndArgument:
-    return "unexpectedBetweenLeftParenAndArgument"
-  case \AttributeSyntax.argument:
-    return "argument"
-  case \AttributeSyntax.unexpectedBetweenArgumentAndRightParen:
-    return "unexpectedBetweenArgumentAndRightParen"
+  case \AttributeSyntax.unexpectedBetweenLeftParenAndArguments:
+    return "unexpectedBetweenLeftParenAndArguments"
+  case \AttributeSyntax.arguments:
+    return "arguments"
+  case \AttributeSyntax.unexpectedBetweenArgumentsAndRightParen:
+    return "unexpectedBetweenArgumentsAndRightParen"
   case \AttributeSyntax.rightParen:
     return "rightParen"
   case \AttributeSyntax.unexpectedAfterRightParen:
@@ -1047,12 +1047,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeLeftParen"
   case \DifferentiabilityParamsSyntax.leftParen:
     return "leftParen"
-  case \DifferentiabilityParamsSyntax.unexpectedBetweenLeftParenAndDiffParams:
-    return "unexpectedBetweenLeftParenAndDiffParams"
-  case \DifferentiabilityParamsSyntax.diffParams:
-    return "diffParams"
-  case \DifferentiabilityParamsSyntax.unexpectedBetweenDiffParamsAndRightParen:
-    return "unexpectedBetweenDiffParamsAndRightParen"
+  case \DifferentiabilityParamsSyntax.unexpectedBetweenLeftParenAndDifferentiabilityParameters:
+    return "unexpectedBetweenLeftParenAndDifferentiabilityParameters"
+  case \DifferentiabilityParamsSyntax.differentiabilityParameters:
+    return "differentiabilityParameters"
+  case \DifferentiabilityParamsSyntax.unexpectedBetweenDifferentiabilityParametersAndRightParen:
+    return "unexpectedBetweenDifferentiabilityParametersAndRightParen"
   case \DifferentiabilityParamsSyntax.rightParen:
     return "rightParen"
   case \DifferentiabilityParamsSyntax.unexpectedAfterRightParen:
@@ -1135,12 +1135,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenForLabelAndColon"
   case \DynamicReplacementArgumentsSyntax.colon:
     return "colon"
-  case \DynamicReplacementArgumentsSyntax.unexpectedBetweenColonAndDeclname:
-    return "unexpectedBetweenColonAndDeclname"
-  case \DynamicReplacementArgumentsSyntax.declname:
-    return "declname"
-  case \DynamicReplacementArgumentsSyntax.unexpectedAfterDeclname:
-    return "unexpectedAfterDeclname"
+  case \DynamicReplacementArgumentsSyntax.unexpectedBetweenColonAndDeclName:
+    return "unexpectedBetweenColonAndDeclName"
+  case \DynamicReplacementArgumentsSyntax.declName:
+    return "declName"
+  case \DynamicReplacementArgumentsSyntax.unexpectedAfterDeclName:
+    return "unexpectedAfterDeclName"
   case \EditorPlaceholderDeclSyntax.unexpectedBeforeAttributes:
     return "unexpectedBeforeAttributes"
   case \EditorPlaceholderDeclSyntax.attributes:
@@ -1629,12 +1629,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "trailingComma"
   case \GenericParameterSyntax.unexpectedAfterTrailingComma:
     return "unexpectedAfterTrailingComma"
-  case \GenericRequirementSyntax.unexpectedBeforeBody:
-    return "unexpectedBeforeBody"
-  case \GenericRequirementSyntax.body:
-    return "body"
-  case \GenericRequirementSyntax.unexpectedBetweenBodyAndTrailingComma:
-    return "unexpectedBetweenBodyAndTrailingComma"
+  case \GenericRequirementSyntax.unexpectedBeforeRequirement:
+    return "unexpectedBeforeRequirement"
+  case \GenericRequirementSyntax.requirement:
+    return "requirement"
+  case \GenericRequirementSyntax.unexpectedBetweenRequirementAndTrailingComma:
+    return "unexpectedBetweenRequirementAndTrailingComma"
   case \GenericRequirementSyntax.trailingComma:
     return "trailingComma"
   case \GenericRequirementSyntax.unexpectedAfterTrailingComma:
@@ -1813,12 +1813,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "rightOperand"
   case \InfixOperatorExprSyntax.unexpectedAfterRightOperand:
     return "unexpectedAfterRightOperand"
-  case \InheritedTypeSyntax.unexpectedBeforeTypeName:
-    return "unexpectedBeforeTypeName"
-  case \InheritedTypeSyntax.typeName:
-    return "typeName"
-  case \InheritedTypeSyntax.unexpectedBetweenTypeNameAndTrailingComma:
-    return "unexpectedBetweenTypeNameAndTrailingComma"
+  case \InheritedTypeSyntax.unexpectedBeforeType:
+    return "unexpectedBeforeType"
+  case \InheritedTypeSyntax.type:
+    return "type"
+  case \InheritedTypeSyntax.unexpectedBetweenTypeAndTrailingComma:
+    return "unexpectedBetweenTypeAndTrailingComma"
   case \InheritedTypeSyntax.trailingComma:
     return "trailingComma"
   case \InheritedTypeSyntax.unexpectedAfterTrailingComma:
@@ -1899,12 +1899,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenExpressionAndIsKeyword"
   case \IsExprSyntax.isKeyword:
     return "isKeyword"
-  case \IsExprSyntax.unexpectedBetweenIsKeywordAndTypeName:
-    return "unexpectedBetweenIsKeywordAndTypeName"
-  case \IsExprSyntax.typeName:
-    return "typeName"
-  case \IsExprSyntax.unexpectedAfterTypeName:
-    return "unexpectedAfterTypeName"
+  case \IsExprSyntax.unexpectedBetweenIsKeywordAndType:
+    return "unexpectedBetweenIsKeywordAndType"
+  case \IsExprSyntax.type:
+    return "type"
+  case \IsExprSyntax.unexpectedAfterType:
+    return "unexpectedAfterType"
   case \IsTypePatternSyntax.unexpectedBeforeIsKeyword:
     return "unexpectedBeforeIsKeyword"
   case \IsTypePatternSyntax.isKeyword:
@@ -2085,12 +2085,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenModifiersAndPound"
   case \MacroExpansionDeclSyntax.pound:
     return "pound"
-  case \MacroExpansionDeclSyntax.unexpectedBetweenPoundAndMacro:
-    return "unexpectedBetweenPoundAndMacro"
-  case \MacroExpansionDeclSyntax.macro:
-    return "macro"
-  case \MacroExpansionDeclSyntax.unexpectedBetweenMacroAndGenericArgumentClause:
-    return "unexpectedBetweenMacroAndGenericArgumentClause"
+  case \MacroExpansionDeclSyntax.unexpectedBetweenPoundAndMacroName:
+    return "unexpectedBetweenPoundAndMacroName"
+  case \MacroExpansionDeclSyntax.macroName:
+    return "macroName"
+  case \MacroExpansionDeclSyntax.unexpectedBetweenMacroNameAndGenericArgumentClause:
+    return "unexpectedBetweenMacroNameAndGenericArgumentClause"
   case \MacroExpansionDeclSyntax.genericArgumentClause:
     return "genericArgumentClause"
   case \MacroExpansionDeclSyntax.unexpectedBetweenGenericArgumentClauseAndLeftParen:
@@ -2119,12 +2119,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforePound"
   case \MacroExpansionExprSyntax.pound:
     return "pound"
-  case \MacroExpansionExprSyntax.unexpectedBetweenPoundAndMacro:
-    return "unexpectedBetweenPoundAndMacro"
-  case \MacroExpansionExprSyntax.macro:
-    return "macro"
-  case \MacroExpansionExprSyntax.unexpectedBetweenMacroAndGenericArgumentClause:
-    return "unexpectedBetweenMacroAndGenericArgumentClause"
+  case \MacroExpansionExprSyntax.unexpectedBetweenPoundAndMacroName:
+    return "unexpectedBetweenPoundAndMacroName"
+  case \MacroExpansionExprSyntax.macroName:
+    return "macroName"
+  case \MacroExpansionExprSyntax.unexpectedBetweenMacroNameAndGenericArgumentClause:
+    return "unexpectedBetweenMacroNameAndGenericArgumentClause"
   case \MacroExpansionExprSyntax.genericArgumentClause:
     return "genericArgumentClause"
   case \MacroExpansionExprSyntax.unexpectedBetweenGenericArgumentClauseAndLeftParen:
@@ -2507,12 +2507,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenTypeAnnotationAndInitializer"
   case \PatternBindingSyntax.initializer:
     return "initializer"
-  case \PatternBindingSyntax.unexpectedBetweenInitializerAndAccessor:
-    return "unexpectedBetweenInitializerAndAccessor"
-  case \PatternBindingSyntax.accessor:
-    return "accessor"
-  case \PatternBindingSyntax.unexpectedBetweenAccessorAndTrailingComma:
-    return "unexpectedBetweenAccessorAndTrailingComma"
+  case \PatternBindingSyntax.unexpectedBetweenInitializerAndAccessors:
+    return "unexpectedBetweenInitializerAndAccessors"
+  case \PatternBindingSyntax.accessors:
+    return "accessors"
+  case \PatternBindingSyntax.unexpectedBetweenAccessorsAndTrailingComma:
+    return "unexpectedBetweenAccessorsAndTrailingComma"
   case \PatternBindingSyntax.trailingComma:
     return "trailingComma"
   case \PatternBindingSyntax.unexpectedAfterTrailingComma:
@@ -2953,12 +2953,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenReturnClauseAndGenericWhereClause"
   case \SubscriptDeclSyntax.genericWhereClause:
     return "genericWhereClause"
-  case \SubscriptDeclSyntax.unexpectedBetweenGenericWhereClauseAndAccessor:
-    return "unexpectedBetweenGenericWhereClauseAndAccessor"
-  case \SubscriptDeclSyntax.accessor:
-    return "accessor"
-  case \SubscriptDeclSyntax.unexpectedAfterAccessor:
-    return "unexpectedAfterAccessor"
+  case \SubscriptDeclSyntax.unexpectedBetweenGenericWhereClauseAndAccessors:
+    return "unexpectedBetweenGenericWhereClauseAndAccessors"
+  case \SubscriptDeclSyntax.accessors:
+    return "accessors"
+  case \SubscriptDeclSyntax.unexpectedAfterAccessors:
+    return "unexpectedAfterAccessors"
   case \SubscriptExprSyntax.unexpectedBeforeCalledExpression:
     return "unexpectedBeforeCalledExpression"
   case \SubscriptExprSyntax.calledExpression:
@@ -3069,12 +3069,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenTargetLabelAndColon"
   case \TargetFunctionEntrySyntax.colon:
     return "colon"
-  case \TargetFunctionEntrySyntax.unexpectedBetweenColonAndDeclname:
-    return "unexpectedBetweenColonAndDeclname"
-  case \TargetFunctionEntrySyntax.declname:
-    return "declname"
-  case \TargetFunctionEntrySyntax.unexpectedBetweenDeclnameAndTrailingComma:
-    return "unexpectedBetweenDeclnameAndTrailingComma"
+  case \TargetFunctionEntrySyntax.unexpectedBetweenColonAndDeclName:
+    return "unexpectedBetweenColonAndDeclName"
+  case \TargetFunctionEntrySyntax.declName:
+    return "declName"
+  case \TargetFunctionEntrySyntax.unexpectedBetweenDeclNameAndTrailingComma:
+    return "unexpectedBetweenDeclNameAndTrailingComma"
   case \TargetFunctionEntrySyntax.trailingComma:
     return "trailingComma"
   case \TargetFunctionEntrySyntax.unexpectedAfterTrailingComma: