Refactor joining trivia pieces into Trivia(joining:)

Author: natikgadzhi

CodeGeneration/Sources/SyntaxSupport/Child.swift

@@ -114,14 +114,7 @@ public class Child {
           """
       )
 
-      let separator = SwiftSyntax.Trivia(pieces: [TriviaPiece.newlines(1), TriviaPiece.docLineComment("///"), TriviaPiece.newlines(1)])
-
-      // Grab the documentation secions, filter out empty ones, and join them
-      // with an empty documentation line inbetween.
-      return [documentationSummary, tokenChoicesTrivia]
-        .filter { !$0.isEmpty }
-        .joined(separator: separator)
-        .reduce(SwiftSyntax.Trivia(), { $0.appending($1) })
+      return SwiftSyntax.Trivia(joining: [documentationSummary, tokenChoicesTrivia])
     }
 
     // If this child is not a token kind, return documentation summary without the choices list.

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

@@ -22,24 +22,12 @@ import Utils
 func syntaxNode(nodesStartingWith: [Character]) -> SourceFileSyntax {
   SourceFileSyntax(leadingTrivia: copyrightHeader) {
     for node in SYNTAX_NODES.compactMap(\.layoutNode) where nodesStartingWith.contains(node.kind.syntaxType.description.first!) {
-      let documentationSections = [
-        node.documentation,
-        node.grammar,
-        node.containedIn,
-      ]
-      let documentation =
-        documentationSections
-        .filter { !$0.isEmpty }
-        .map { [$0] }
-        .joined(separator: [Trivia.newline, Trivia.docLineComment("///"), Trivia.newline])
-        .reduce(Trivia(), +)
-
       // We are actually handling this node now
       try! StructDeclSyntax(
         """
         // MARK: - \(node.kind.syntaxType)
 
-        \(documentation)
+        \(SwiftSyntax.Trivia(joining: [node.documentation, node.grammar, node.containedIn]))
         \(node.node.apiAttributes())\
         public struct \(node.kind.syntaxType): \(node.baseType.syntaxBaseName)Protocol, SyntaxHashable, \(node.base.leafProtocolType)
         """