Pass SyntaxData to RawSyntax initializer

Author: ahoppen

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxNodesFile.swift

@@ -80,17 +80,18 @@ func syntaxNode(nodesStartingWith: [Character]) -> SourceFileSyntax {
               )
             )
           )
-          let layoutList = ArrayExprSyntax {
-            for child in node.children {
-              ArrayElementSyntax(
-                expression: MemberAccessExprSyntax(
-                  base: child.buildableType.optionalChained(expr: ExprSyntax("\(child.varOrCaseName.backtickedIfNeeded)")),
-                  period: .periodToken(),
-                  name: "raw"
-                )
-              )
-            }
-          }
+          VariableDeclSyntax(
+            .let,
+            name: "nodes",
+            type: TypeAnnotationSyntax(type: TypeSyntax("[Syntax?]")),
+            initializer: InitializerClauseSyntax(
+              value: ArrayExprSyntax {
+                for child in node.children {
+                  ArrayElementSyntax(expression: ExprSyntax("Syntax(\(child.varOrCaseName.backtickedIfNeeded))"))
+                }
+              }
+            )
+          )
 
           let initializer = FunctionCallExprSyntax(
             calledExpression: ExprSyntax("withExtendedLifetime"),
@@ -103,12 +104,11 @@ func syntaxNode(nodesStartingWith: [Character]) -> SourceFileSyntax {
               if node.children.isEmpty {
                 DeclSyntax("let raw = RawSyntax.makeEmptyLayout(kind: SyntaxKind.\(node.varOrCaseName), arena: arena)")
               } else {
-                DeclSyntax("let layout: [RawSyntax?] = \(layoutList)")
                 DeclSyntax(
                   """
                   let raw = RawSyntax.makeLayout(
                     kind: SyntaxKind.\(node.varOrCaseName),
-                    from: layout,
+                    from: nodes,
                     arena: arena,
                     leadingTrivia: leadingTrivia,
                     trailingTrivia: trailingTrivia
@@ -131,18 +131,6 @@ func syntaxNode(nodesStartingWith: [Character]) -> SourceFileSyntax {
             rightOperand: initializer
           )
 
-          VariableDeclSyntax(
-            .let,
-            name: "nodes",
-            type: TypeAnnotationSyntax(type: TypeSyntax("[Syntax?]")),
-            initializer: InitializerClauseSyntax(
-              value: ArrayExprSyntax {
-                for child in node.children {
-                  ArrayElementSyntax(expression: ExprSyntax("Syntax(\(child.varOrCaseName.backtickedIfNeeded))"))
-                }
-              }
-            )
-          )
           ExprSyntax("Syntax(self).setSyntaxTrackingOfTree(SyntaxTracking(tracking: nodes))")
         }
 
@@ -202,7 +190,7 @@ func syntaxNode(nodesStartingWith: [Character]) -> SourceFileSyntax {
                   collection = col.layoutView!.appending(element.raw, arena: arena)
                 } else {
                   collection = RawSyntax.makeLayout(kind: SyntaxKind.\(childNode.varOrCaseName),
-                                                    from: [element.raw], arena: arena)
+                                                    from: [Syntax(element)], arena: arena)
                 }
                 return Syntax(self)
                   .replacingChild(at: \(raw: index), with: collection, rawNodeArena: arena, allocationArena: arena)

Sources/SwiftSyntax/Raw/RawSyntax.swift

@@ -820,13 +820,13 @@ extension RawSyntax {
 
   static func makeLayout(
     kind: SyntaxKind,
-    from collection: some Collection<RawSyntax?>,
+    from collection: some Collection<Syntax?>,
     arena: __shared SyntaxArena,
     leadingTrivia: Trivia? = nil,
     trailingTrivia: Trivia? = nil
   ) -> RawSyntax {
     if leadingTrivia != nil || trailingTrivia != nil {
-      var layout = Array(collection)
+      var layout = collection.map { $0?.raw }
       if let leadingTrivia = leadingTrivia,
         // Find the index of the first non-empty node so we can attach the trivia to it.
         let idx = layout.firstIndex(where: { $0 != nil && ($0!.isToken || $0!.totalNodes > 1) })
@@ -839,11 +839,13 @@ extension RawSyntax {
       {
         layout[idx] = layout[idx]!.withTrailingTrivia((layout[idx]?.formTrailingTrivia() ?? []) + trailingTrivia, arena: arena)
       }
-      return .makeLayout(kind: kind, from: layout, arena: arena)
+      return .makeLayout(kind: kind, uninitializedCount: collection.count, arena: arena) {
+        _ = $0.initialize(from: layout)
+      }
     }
 
     return .makeLayout(kind: kind, uninitializedCount: collection.count, arena: arena) {
-      _ = $0.initialize(from: collection)
+      _ = $0.initialize(from: collection.lazy.map { $0?.raw })
     }
   }
 }

Sources/SwiftSyntax/SyntaxCollection.swift

@@ -45,7 +45,7 @@ extension SyntaxCollection {
     let raw = withExtendedLifetime(children) {
       RawSyntax.makeLayout(
         kind: Self.syntaxKind,
-        from: children.map { $0.raw },
+        from: children.map { Syntax($0) },
         arena: arena
       )
     }