Validate that we don’t use abbreviations in child names

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -1778,7 +1778,8 @@ public let DECL_NODES: [Node] = [
         kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
       ),
       Child(
-        name: "Args",
+        name: "Arguments",
+        deprecatedName: "Args",
         kind: .node(kind: .poundSourceLocationArgs),
         nameForDiagnostics: "arguments",
         isOptional: true

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -1320,7 +1320,8 @@ public let EXPR_NODES: [Node] = [
         kind: .token(choices: [.keyword(text: "each")])
       ),
       Child(
-        name: "PackRefExpr",
+        name: "PackReference",
+        deprecatedName: "PackRefExpr",
         kind: .node(kind: .expr)
       ),
     ]

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -621,4 +621,26 @@ class ValidateSyntaxNodes: XCTestCase {
       ]
     )
   }
+
+  func testNoAbbreviationsInChildNames() {
+    var failures: [ValidationFailure] = []
+
+    for node in SYNTAX_NODES.compactMap(\.layoutNode) {
+      for child in node.nonUnexpectedChildren {
+        if child.name.contains("Args") {
+          failures.append(
+            ValidationFailure(
+              node: node.kind,
+              message: "child '\(child.name)' should not contain abbreviations"
+            )
+          )
+        }
+      }
+    }
+
+    assertFailuresMatchXFails(
+      failures,
+      expectedFailures: []
+    )
+  }
 }

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -270,7 +270,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "file name"
   case \PoundSourceLocationArgsSyntax.lineNumber:
     return "line number"
-  case \PoundSourceLocationSyntax.args:
+  case \PoundSourceLocationSyntax.arguments:
     return "arguments"
   case \PrecedenceGroupDeclSyntax.attributes:
     return "attributes"

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

@@ -2445,12 +2445,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeEachKeyword"
   case \PackElementExprSyntax.eachKeyword:
     return "eachKeyword"
-  case \PackElementExprSyntax.unexpectedBetweenEachKeywordAndPackRefExpr:
-    return "unexpectedBetweenEachKeywordAndPackRefExpr"
-  case \PackElementExprSyntax.packRefExpr:
-    return "packRefExpr"
-  case \PackElementExprSyntax.unexpectedAfterPackRefExpr:
-    return "unexpectedAfterPackRefExpr"
+  case \PackElementExprSyntax.unexpectedBetweenEachKeywordAndPackReference:
+    return "unexpectedBetweenEachKeywordAndPackReference"
+  case \PackElementExprSyntax.packReference:
+    return "packReference"
+  case \PackElementExprSyntax.unexpectedAfterPackReference:
+    return "unexpectedAfterPackReference"
   case \PackExpansionExprSyntax.unexpectedBeforeRepeatKeyword:
     return "unexpectedBeforeRepeatKeyword"
   case \PackExpansionExprSyntax.repeatKeyword:
@@ -2575,12 +2575,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenPoundSourceLocationAndLeftParen"
   case \PoundSourceLocationSyntax.leftParen:
     return "leftParen"
-  case \PoundSourceLocationSyntax.unexpectedBetweenLeftParenAndArgs:
-    return "unexpectedBetweenLeftParenAndArgs"
-  case \PoundSourceLocationSyntax.args:
-    return "args"
-  case \PoundSourceLocationSyntax.unexpectedBetweenArgsAndRightParen:
-    return "unexpectedBetweenArgsAndRightParen"
+  case \PoundSourceLocationSyntax.unexpectedBetweenLeftParenAndArguments:
+    return "unexpectedBetweenLeftParenAndArguments"
+  case \PoundSourceLocationSyntax.arguments:
+    return "arguments"
+  case \PoundSourceLocationSyntax.unexpectedBetweenArgumentsAndRightParen:
+    return "unexpectedBetweenArgumentsAndRightParen"
   case \PoundSourceLocationSyntax.rightParen:
     return "rightParen"
   case \PoundSourceLocationSyntax.unexpectedAfterRightParen:

Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift

@@ -4403,6 +4403,61 @@ extension OptionalBindingConditionSyntax {
   }
 }
 
+extension PackElementExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenEachKeywordAndPackReference")
+  public var unexpectedBetweenEachKeywordAndPackRefExpr: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenEachKeywordAndPackReference
+    }
+    set {
+      unexpectedBetweenEachKeywordAndPackReference = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "packReference")
+  public var packRefExpr: ExprSyntax {
+    get {
+      return packReference
+    }
+    set {
+      packReference = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterPackReference")
+  public var unexpectedAfterPackRefExpr: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterPackReference
+    }
+    set {
+      unexpectedAfterPackReference = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with packReference argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeEachKeyword: UnexpectedNodesSyntax? = nil,
+      eachKeyword: TokenSyntax = .keyword(.each),
+      _ unexpectedBetweenEachKeywordAndPackRefExpr: UnexpectedNodesSyntax? = nil,
+      packRefExpr: some ExprSyntaxProtocol,
+      _ unexpectedAfterPackRefExpr: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeEachKeyword, 
+        eachKeyword: eachKeyword, 
+        unexpectedBetweenEachKeywordAndPackRefExpr, 
+        packReference: packRefExpr, 
+        unexpectedAfterPackRefExpr, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
 extension ParameterClauseSyntax {
   @available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndParameters")
   public var unexpectedBetweenLeftParenAndParameterList: UnexpectedNodesSyntax? {
@@ -4662,6 +4717,69 @@ extension PoundSourceLocationArgsSyntax {
   }
 }
 
+extension PoundSourceLocationSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndArguments")
+  public var unexpectedBetweenLeftParenAndArgs: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLeftParenAndArguments
+    }
+    set {
+      unexpectedBetweenLeftParenAndArguments = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "arguments")
+  public var args: PoundSourceLocationArgsSyntax? {
+    get {
+      return arguments
+    }
+    set {
+      arguments = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenArgumentsAndRightParen")
+  public var unexpectedBetweenArgsAndRightParen: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenArgumentsAndRightParen
+    }
+    set {
+      unexpectedBetweenArgumentsAndRightParen = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with arguments argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforePoundSourceLocation: UnexpectedNodesSyntax? = nil,
+      poundSourceLocation: TokenSyntax = .poundSourceLocationToken(),
+      _ unexpectedBetweenPoundSourceLocationAndLeftParen: UnexpectedNodesSyntax? = nil,
+      leftParen: TokenSyntax = .leftParenToken(),
+      _ unexpectedBetweenLeftParenAndArgs: UnexpectedNodesSyntax? = nil,
+      args: PoundSourceLocationArgsSyntax? = nil,
+      _ unexpectedBetweenArgsAndRightParen: UnexpectedNodesSyntax? = nil,
+      rightParen: TokenSyntax = .rightParenToken(),
+      _ unexpectedAfterRightParen: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforePoundSourceLocation, 
+        poundSourceLocation: poundSourceLocation, 
+        unexpectedBetweenPoundSourceLocationAndLeftParen, 
+        leftParen: leftParen, 
+        unexpectedBetweenLeftParenAndArgs, 
+        arguments: args, 
+        unexpectedBetweenArgsAndRightParen, 
+        rightParen: rightParen, 
+        unexpectedAfterRightParen, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
 extension PrecedenceGroupAssignmentSyntax {
   @available(*, deprecated, renamed: "unexpectedBeforeAssignmentLabel")
   public var unexpectedBeforeAssignmentKeyword: UnexpectedNodesSyntax? {

Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

@@ -16088,19 +16088,19 @@ public struct RawPackElementExprSyntax: RawExprSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeEachKeyword: RawUnexpectedNodesSyntax? = nil, 
       eachKeyword: RawTokenSyntax, 
-      _ unexpectedBetweenEachKeywordAndPackRefExpr: RawUnexpectedNodesSyntax? = nil, 
-      packRefExpr: RawExprSyntax, 
-      _ unexpectedAfterPackRefExpr: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenEachKeywordAndPackReference: RawUnexpectedNodesSyntax? = nil, 
+      packReference: RawExprSyntax, 
+      _ unexpectedAfterPackReference: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .packElementExpr, uninitializedCount: 5, arena: arena) { layout in
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeEachKeyword?.raw
       layout[1] = eachKeyword.raw
-      layout[2] = unexpectedBetweenEachKeywordAndPackRefExpr?.raw
-      layout[3] = packRefExpr.raw
-      layout[4] = unexpectedAfterPackRefExpr?.raw
+      layout[2] = unexpectedBetweenEachKeywordAndPackReference?.raw
+      layout[3] = packReference.raw
+      layout[4] = unexpectedAfterPackReference?.raw
     }
     self.init(unchecked: raw)
   }
@@ -16113,15 +16113,15 @@ public struct RawPackElementExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
 
-  public var unexpectedBetweenEachKeywordAndPackRefExpr: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenEachKeywordAndPackReference: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 
-  public var packRefExpr: RawExprSyntax {
+  public var packReference: RawExprSyntax {
     layoutView.children[3].map(RawExprSyntax.init(raw:))!
   }
 
-  public var unexpectedAfterPackRefExpr: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterPackReference: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -16947,9 +16947,9 @@ public struct RawPoundSourceLocationSyntax: RawDeclSyntaxNodeProtocol {
       poundSourceLocation: RawTokenSyntax, 
       _ unexpectedBetweenPoundSourceLocationAndLeftParen: RawUnexpectedNodesSyntax? = nil, 
       leftParen: RawTokenSyntax, 
-      _ unexpectedBetweenLeftParenAndArgs: RawUnexpectedNodesSyntax? = nil, 
-      args: RawPoundSourceLocationArgsSyntax?, 
-      _ unexpectedBetweenArgsAndRightParen: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenLeftParenAndArguments: RawUnexpectedNodesSyntax? = nil, 
+      arguments: RawPoundSourceLocationArgsSyntax?, 
+      _ unexpectedBetweenArgumentsAndRightParen: RawUnexpectedNodesSyntax? = nil, 
       rightParen: RawTokenSyntax, 
       _ unexpectedAfterRightParen: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
@@ -16961,9 +16961,9 @@ public struct RawPoundSourceLocationSyntax: RawDeclSyntaxNodeProtocol {
       layout[1] = poundSourceLocation.raw
       layout[2] = unexpectedBetweenPoundSourceLocationAndLeftParen?.raw
       layout[3] = leftParen.raw
-      layout[4] = unexpectedBetweenLeftParenAndArgs?.raw
-      layout[5] = args?.raw
-      layout[6] = unexpectedBetweenArgsAndRightParen?.raw
+      layout[4] = unexpectedBetweenLeftParenAndArguments?.raw
+      layout[5] = arguments?.raw
+      layout[6] = unexpectedBetweenArgumentsAndRightParen?.raw
       layout[7] = rightParen.raw
       layout[8] = unexpectedAfterRightParen?.raw
     }
@@ -16986,15 +16986,15 @@ public struct RawPoundSourceLocationSyntax: RawDeclSyntaxNodeProtocol {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
 
-  public var unexpectedBetweenLeftParenAndArgs: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftParenAndArguments: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 
-  public var args: RawPoundSourceLocationArgsSyntax? {
+  public var arguments: RawPoundSourceLocationArgsSyntax? {
     layoutView.children[5].map(RawPoundSourceLocationArgsSyntax.init(raw:))
   }
 
-  public var unexpectedBetweenArgsAndRightParen: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenArgumentsAndRightParen: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }