Rename TupleExprElement -> LabeledExpr

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -60,7 +60,7 @@ public let ATTRIBUTE_NODES: [Node] = [
         kind: .nodeChoices(choices: [
           Child(
             name: "ArgumentList",
-            kind: .node(kind: .tupleExprElementList)
+            kind: .node(kind: .labeledExprList)
           ),
           Child(
             name: "Token",

CodeGeneration/Sources/SyntaxSupport/BuilderInitializableTypes.swift

@@ -25,11 +25,11 @@ public let BUILDER_INITIALIZABLE_TYPES: [SyntaxNodeKind: SyntaxNodeKind?] = [
   .genericParameterList: nil,
   .genericRequirementList: nil,
   .inheritedTypeList: nil,
+  .labeledExprList: nil,
   .memberBlock: .memberBlockItemList,
   .memberBlockItemList: nil,
   .patternBindingList: nil,
   .switchCaseItemList: nil,
   .switchCaseList: nil,
-  .tupleExprElementList: nil,
   .tuplePatternElementList: nil,
 ]

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -81,7 +81,7 @@ public let DECL_NODES: [Node] = [
       Child(
         name: "Properties",
         deprecatedName: "PropertyList",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Property"),
+        kind: .collection(kind: .labeledExprList, collectionElementName: "Property"),
         nameForDiagnostics: "properties"
       ),
       Child(
@@ -107,7 +107,7 @@ public let DECL_NODES: [Node] = [
       Child(
         name: "Properties",
         deprecatedName: "PropertyList",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Property"),
+        kind: .collection(kind: .labeledExprList, collectionElementName: "Property"),
         nameForDiagnostics: "properties"
       ),
       Child(
@@ -1487,7 +1487,7 @@ public let DECL_NODES: [Node] = [
       Child(
         name: "Arguments",
         deprecatedName: "ArgumentList",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument")
+        kind: .collection(kind: .labeledExprList, collectionElementName: "Argument")
       ),
       Child(
         name: "RightParen",

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -749,7 +749,7 @@ public let EXPR_NODES: [Node] = [
       ),
       Child(
         name: "Expressions",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Expression")
+        kind: .collection(kind: .labeledExprList, collectionElementName: "Expression")
       ),
       Child(
         name: "RightParen",
@@ -812,7 +812,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "Arguments",
         deprecatedName: "ArgumentList",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument"),
+        kind: .collection(kind: .labeledExprList, collectionElementName: "Argument"),
         nameForDiagnostics: "arguments"
       ),
       Child(
@@ -1128,7 +1128,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "Arguments",
         deprecatedName: "ArgumentList",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument"),
+        kind: .collection(kind: .labeledExprList, collectionElementName: "Argument"),
         nameForDiagnostics: "arguments"
       ),
       Child(
@@ -1173,7 +1173,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "Arguments",
         deprecatedName: "ArgumentList",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument")
+        kind: .collection(kind: .labeledExprList, collectionElementName: "Argument")
       ),
       Child(
         name: "RightParen",
@@ -1549,7 +1549,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "Arguments",
         deprecatedName: "ArgumentList",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument"),
+        kind: .collection(kind: .labeledExprList, collectionElementName: "Argument"),
         nameForDiagnostics: "arguments"
       ),
       Child(
@@ -1770,15 +1770,15 @@ public let EXPR_NODES: [Node] = [
   ),
 
   Node(
-    kind: .tupleExprElementList,
+    kind: .labeledExprList,
     base: .syntaxCollection,
     nameForDiagnostics: nil,
-    elementChoices: [.tupleExprElement]
+    elementChoices: [.labeledExpr]
   ),
 
   // An element inside a tuple element list
   Node(
-    kind: .tupleExprElement,
+    kind: .labeledExpr,
     base: .syntax,
     nameForDiagnostics: nil,
     traits: [
@@ -1824,7 +1824,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "Elements",
         deprecatedName: "ElementList",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Element")
+        kind: .collection(kind: .labeledExprList, collectionElementName: "Element")
       ),
       Child(
         name: "RightParen",

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -180,6 +180,8 @@ public enum SyntaxNodeKind: String, CaseIterable {
   case keyPathOptionalComponent
   case keyPathPropertyComponent
   case keyPathSubscriptComponent
+  case labeledExpr
+  case labeledExprList
   case labeledSpecializeArgument
   case labeledStmt
   case layoutRequirement
@@ -271,8 +273,6 @@ public enum SyntaxNodeKind: String, CaseIterable {
   case throwStmt
   case tryExpr
   case tupleExpr
-  case tupleExprElement
-  case tupleExprElementList
   case tuplePattern
   case tuplePatternElement
   case tuplePatternElementList
@@ -407,6 +407,8 @@ public enum SyntaxNodeKind: String, CaseIterable {
     case .importPathComponent: return "accessPathComponent"
     case .importPathComponentList: return "accessPath"
     case .inheritanceClause: return "typeInheritanceClause"
+    case .labeledExpr: return "tupleExprElement"
+    case .labeledExprList: return "tupleExprElementList"
     case .labeledSpecializeArgument: return "labeledSpecializeEntry"
     case .memberBlock: return "memberDeclBlock"
     case .memberBlockItem: return "memberDeclListItem"

CodeGeneration/Sources/SyntaxSupport/Traits.swift

@@ -66,7 +66,7 @@ public let TRAITS: [Trait] = [
       Child(name: "Macro", kind: .token(choices: [.token(tokenKind: "IdentifierToken")])),
       Child(name: "GenericArgumentClause", kind: .node(kind: .genericArgumentClause), isOptional: true),
       Child(name: "LeftParen", kind: .token(choices: [.token(tokenKind: "LeftParenToken")]), isOptional: true),
-      Child(name: "ArgumentList", kind: .node(kind: .tupleExprElementList)),
+      Child(name: "ArgumentList", kind: .node(kind: .labeledExprList)),
       Child(name: "RightParen", kind: .token(choices: [.token(tokenKind: "RightParenToken")]), isOptional: true),
       Child(name: "TrailingClosure", kind: .node(kind: .closureExpr), isOptional: true),
       Child(name: "AdditionalTrailingClosures", kind: .node(kind: .multipleTrailingClosureElementList), isOptional: true),

CodeGeneration/Sources/Utils/CodeGenerationFormat.swift

@@ -79,11 +79,11 @@ public class CodeGenerationFormat: BasicFormat {
     }
   }
 
-  public override func visit(_ node: TupleExprElementListSyntax) -> TupleExprElementListSyntax {
+  public override func visit(_ node: LabeledExprListSyntax) -> LabeledExprListSyntax {
     let children = node.children(viewMode: .all)
     // Short tuple element list literals are presented on one line, list each element on a different line.
     if children.count > 3 {
-      return TupleExprElementListSyntax(formatChildrenSeparatedByNewline(children: children, elementType: TupleExprElementSyntax.self))
+      return LabeledExprListSyntax(formatChildrenSeparatedByNewline(children: children, elementType: LabeledExprSyntax.self))
     } else {
       return super.visit(node)
     }

CodeGeneration/Sources/Utils/SyntaxBuildableChild.swift

@@ -151,7 +151,7 @@ public extension Child {
     }
     let disjunction = ExprListSyntax(preconditionChoices.flatMap { [$0, ExprSyntax(BinaryOperatorExprSyntax(text: "||"))] }.dropLast())
     return FunctionCallExprSyntax(callee: ExprSyntax("precondition")) {
-      TupleExprElementSyntax(expression: SequenceExprSyntax(elements: disjunction))
+      LabeledExprSyntax(expression: SequenceExprSyntax(elements: disjunction))
     }
   }
 }

CodeGeneration/Sources/generate-swiftsyntax/LayoutNode+Extensions.swift

@@ -106,7 +106,7 @@ extension LayoutNode {
     // they can use trailing closure syntax.
     var normalParameters: [FunctionParameterSyntax] = []
     var builderParameters: [FunctionParameterSyntax] = []
-    var delegatedInitArgs: [TupleExprElementSyntax] = []
+    var delegatedInitArgs: [LabeledExprSyntax] = []
 
     for child in children {
       /// The expression that is used to call the default initializer defined above.
@@ -150,7 +150,7 @@ extension LayoutNode {
         )
       }
       delegatedInitArgs.append(
-        TupleExprElementSyntax(
+        LabeledExprSyntax(
           label: child.isUnexpectedNodes ? nil : child.varOrCaseName,
           colon: child.isUnexpectedNodes ? nil : .colonToken(),
           expression: produceExpr
@@ -177,11 +177,11 @@ extension LayoutNode {
       """
     ) {
       FunctionCallExprSyntax(callee: ExprSyntax("try self.init")) {
-        TupleExprElementSyntax(label: "leadingTrivia", expression: ExprSyntax("leadingTrivia"))
+        LabeledExprSyntax(label: "leadingTrivia", expression: ExprSyntax("leadingTrivia"))
         for arg in delegatedInitArgs {
           arg
         }
-        TupleExprElementSyntax(label: "trailingTrivia", expression: ExprSyntax("trailingTrivia"))
+        LabeledExprSyntax(label: "trailingTrivia", expression: ExprSyntax("trailingTrivia"))
       }
     }
   }

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift

@@ -68,19 +68,19 @@ let renamedChildrenCompatibilityFile = try! SourceFileSyntax(leadingTrivia: copy
         """
       ) {
         FunctionCallExprSyntax(callee: ExprSyntax("self.init")) {
-          TupleExprElementSyntax(label: "leadingTrivia", expression: ExprSyntax("leadingTrivia"))
+          LabeledExprSyntax(label: "leadingTrivia", expression: ExprSyntax("leadingTrivia"))
           for child in layoutNode.children {
             if child.isUnexpectedNodes {
-              TupleExprElementSyntax(expression: ExprSyntax("\(raw: child.deprecatedVarName ?? child.varOrCaseName)"))
+              LabeledExprSyntax(expression: ExprSyntax("\(raw: child.deprecatedVarName ?? child.varOrCaseName)"))
             } else {
-              TupleExprElementSyntax(
+              LabeledExprSyntax(
                 label: child.varOrCaseName,
                 colon: .colonToken(),
                 expression: IdentifierExprSyntax(identifier: child.deprecatedVarName ?? child.varOrCaseName)
               )
             }
           }
-          TupleExprElementSyntax(label: "trailingTrivia", expression: ExprSyntax("trailingTrivia"))
+          LabeledExprSyntax(label: "trailingTrivia", expression: ExprSyntax("trailingTrivia"))
         }
       }
     }