Fix indentation issue if a parsed syntax node with comments is used inside a builder

Author: ahoppen

CodeGeneration/Sources/generate-swiftbasicformat/FormatFile.swift

@@ -181,7 +181,7 @@ private func createBuildableNodeFormatFunction(node: Node) -> FunctionDecl {
         "result"
         AssignmentExpr()
         FunctionCallExpr(MemberAccessExpr(base: "result", name: "withLeadingTrivia")) {
-          TupleExprElement(expression: FunctionCallExpr(MemberAccessExpr(base: "leadingTrivia", name: "addingSpacingAfterNewlinesIfNeeded")))
+          TupleExprElement(expression: "leadingTrivia")
         }
       }
     }
@@ -203,8 +203,7 @@ private func createBuildableCollectionNodeFormatFunction(node: Node) -> Function
           MemberAccessExpr(base: "syntax", name: "map"),
           trailingClosure: ClosureExpr {
             FunctionCallExpr(MemberAccessExpr(base: "$0", name: "withLeadingTrivia")) {
-              TupleExprElement(expression: FunctionCallExpr(MemberAccessExpr(
-                base: TupleExpr {
+              TupleExprElement(expression: TupleExpr {
                   SequenceExpr {
                     "indentedNewline"
                     BinaryOperatorExpr("+")
@@ -216,9 +215,8 @@ private func createBuildableCollectionNodeFormatFunction(node: Node) -> Function
                       }
                     }
                   }
-                },
-                name: "addingSpacingAfterNewlinesIfNeeded"
-              )))
+                }
+              )
             }
           }
         ))

CodeGeneration/Sources/generate-swiftsyntaxbuilder/BuildableNodesFile.swift

@@ -416,7 +416,14 @@ private func createBuildFunction(node: Node, trivias: [String]) -> FunctionDecl
           )
         )
       ) {
-        ReturnStmt(expression: "node")
+        ReturnStmt(expression: FunctionCallExpr(MemberAccessExpr(base: "Indenter", name: "indent")) {
+          TupleExprElement(expression: "node")
+          TupleExprElement(
+            label: "indentation",
+            expression: MemberAccessExpr(base: "format", name: "indentTrivia")
+          )
+        }
+        )
       }
     }
   }

CodeGeneration/Sources/generate-swiftsyntaxbuilder/SyntaxUtilities.swift

@@ -137,21 +137,36 @@ func createTriviaAttachment(varName: ExpressibleAsExprBuildable, triviaVarName:
       )
     }
   ) {
+    VariableDecl(
+      .let,
+      name: "trivia",
+      initializer: FunctionCallExpr(MemberAccessExpr(
+        base: TupleExpr {
+          SequenceExpr {
+            triviaVarName
+            BinaryOperatorExpr("+")
+            TupleExpr {
+              SequenceExpr {
+                MemberAccessExpr(base: varName, name: trivia)
+                BinaryOperatorExpr("??")
+                ArrayExpr()
+              }
+            }
+          }
+        },
+        name: "indented"
+      )) {
+        TupleExprElement(
+          label: "indentation",
+          expression: MemberAccessExpr(base: "format", name: "indentTrivia")
+        )
+      }
+    )
     SequenceExpr {
       varName
       AssignmentExpr()
       FunctionCallExpr(MemberAccessExpr(base: varName, name: "with\(trivia.withFirstCharacterUppercased)")) {
-        TupleExprElement(expression: SequenceExpr {
-          triviaVarName
-          BinaryOperatorExpr("+")
-          TupleExpr {
-            SequenceExpr {
-              MemberAccessExpr(base: varName, name: trivia)
-              BinaryOperatorExpr("??")
-              ArrayExpr()
-            }
-          }
-        })
+        TupleExprElement(expression: "trivia")
       }
     }
   }

Sources/SwiftBasicFormat/CMakeLists.txt

@@ -7,7 +7,6 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 add_library(SwiftBasicFormat STATIC
-  Trivia+Extension.swift
   generated/Format.swift
 )