Merge pull request #1154 from ahoppen/ahoppen/dont-override-trivia

Prepend/append trivia passed to RawSyntax.makeLayout instead of overriding it

Author: ahoppen

Sources/SwiftSyntax/Raw/RawSyntax.swift

@@ -738,12 +738,12 @@ extension RawSyntax {
       if let leadingTrivia = leadingTrivia,
         let idx = layout.firstIndex(where: { $0 != nil })
       {
-        layout[idx] = layout[idx]!.withLeadingTrivia(leadingTrivia, arena: arena)
+        layout[idx] = layout[idx]!.withLeadingTrivia(leadingTrivia + (layout[idx]?.formLeadingTrivia() ?? []), arena: arena)
       }
       if let trailingTrivia = trailingTrivia,
         let idx = layout.lastIndex(where: { $0 != nil })
       {
-        layout[idx] = layout[idx]!.withTrailingTrivia(trailingTrivia, arena: arena)
+        layout[idx] = layout[idx]!.withTrailingTrivia((layout[idx]?.formTrailingTrivia() ?? []) + trailingTrivia, arena: arena)
       }
       return .makeLayout(kind: kind, from: layout, arena: arena)
     }

Tests/SwiftSyntaxTest/SyntaxCreationTests.swift

@@ -211,4 +211,27 @@ public class SyntaxCreationTests: XCTestCase {
       XCTAssertEqual("\(exprList)", "1 \(operatorName) 1")
     }
   }
+
+  func testTriviaInInitializxerDoesNotOverrideFirstNode() {
+    let node = ExpressionPatternSyntax(
+      leadingTrivia: .lineComment("// Outer leading") + .newline,
+      expression: IntegerLiteralExprSyntax(
+        leadingTrivia: .lineComment("// Inner leading") + .newline,
+        digits: .integerLiteral("42"),
+        trailingTrivia: .newline + .lineComment("// Inner trailing")
+      ),
+      trailingTrivia: .newline + .lineComment("// Outer trailing")
+    )
+
+    XCTAssertEqual(
+      node.description,
+      """
+      // Outer leading
+      // Inner leading
+      42
+      // Inner trailing
+      // Outer trailing
+      """
+    )
+  }
 }