Fix to test indentation and prepending leading trivia

Author: akkyie

Tests/SwiftSyntaxBuilderTest/ImportTests.swift

@@ -5,16 +5,16 @@ import SwiftSyntax
 
 final class ImportTests: XCTestCase {
   func testImport() {
-    let format = Format(indentWidth: 2).indented()
+    let leadingTrivia = Trivia.garbageText("␣")
 
     let testCases: [UInt: (Import, String)] = [
       #line: (Import("SwiftSyntax"),
-              "  import SwiftSyntax"),
+              "␣import SwiftSyntax"),
     ]
 
     for (line, testCase) in testCases {
       let (builder, expected) = testCase
-      let syntax = builder.buildSyntax(format: format, leadingTrivia: .zero)
+      let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
 
       var text = ""
       syntax.write(to: &text)

Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift

@@ -4,19 +4,19 @@ import SwiftSyntax
 @testable import SwiftSyntaxBuilder
 
 final class IntegerLiteralTests: XCTestCase {
-  let format = Format(indentWidth: 2).indented()
-
   func testIntegerLiteral() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
     let testCases: [UInt: (IntegerLiteral, String)] = [
-      #line: (IntegerLiteral(123), "123"),
-      #line: (IntegerLiteral(-123), "-123"),
-      #line: (123, "123"),
-      #line: (-123, "-123"),
+      #line: (IntegerLiteral(123), "␣123"),
+      #line: (IntegerLiteral(-123), "␣-123"),
+      #line: (123, "␣123"),
+      #line: (-123, "␣-123"),
     ]
 
     for (line, testCase) in testCases {
       let (builder, expected) = testCase
-      let syntax = builder.buildSyntax(format: format, leadingTrivia: .zero)
+      let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
 
       var text = ""
       syntax.write(to: &text)

Tests/SwiftSyntaxBuilderTest/SourceFileTests.swift

@@ -4,9 +4,9 @@ import SwiftSyntax
 @testable import SwiftSyntaxBuilder
 
 final class SourceFileTests: XCTestCase {
-  let format = Format(indentWidth: 2).indented()
-
   func testSourceFile() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
     let sourceFile = SourceFile {
       Import("SwiftSyntax")
 
@@ -15,15 +15,15 @@ final class SourceFileTests: XCTestCase {
       }
     }
 
-    let syntax = sourceFile.buildSyntax(format: format, leadingTrivia: .zero)
+    let syntax = sourceFile.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
 
     var text = ""
     syntax.write(to: &text)
     XCTAssertEqual(text, """
-      import SwiftSyntax
-      struct ExampleStruct {
+    ␣import SwiftSyntax
+    struct ExampleStruct {
         let syntax: Syntax
-      }
+    }
     """)
   }
 }

Tests/SwiftSyntaxBuilderTest/StringLiteralTests.swift

@@ -4,19 +4,19 @@ import SwiftSyntax
 @testable import SwiftSyntaxBuilder
 
 final class StringLiteralTests: XCTestCase {
-  let format = Format(indentWidth: 2).indented()
-
   func testStringLiteral() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
     let testCases: [UInt: (StringLiteral, String)] = [
-      #line: (StringLiteral(""), "\"\""),
-      #line: (StringLiteral("asdf"), #""asdf""#),
-      #line: ("", "\"\""),
-      #line: ("asdf", #""asdf""#),
+      #line: (StringLiteral(""), #"␣"""#),
+      #line: (StringLiteral("asdf"), #"␣"asdf""#),
+      #line: ("", #"␣"""#),
+      #line: ("asdf", #"␣"asdf""#),
     ]
 
     for (line, testCase) in testCases {
       let (builder, expected) = testCase
-      let syntax = builder.buildSyntax(format: format, leadingTrivia: .zero)
+      let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
 
       var text = ""
       syntax.write(to: &text)

Tests/SwiftSyntaxBuilderTest/StructTests.swift

@@ -4,38 +4,76 @@ import SwiftSyntax
 @testable import SwiftSyntaxBuilder
 
 final class StructTests: XCTestCase {
-  let format = Format(indentWidth: 2).indented()
-
-  func testStruct() {
-    let testCases: [UInt: (Struct, String)] = [
-      #line: (
-        Struct("TestStruct"),
-        """
-          struct TestStruct {
-          }
-        """
-      ),
-
-      #line: (
-        Struct("TestStruct") {
-          Let("name", of: "String")
-        },
-        """
-          struct TestStruct {
-            let name: String
-          }
-        """
-      ),
-    ]
-
-    for (line, testCase) in testCases {
-      let (builder, expected) = testCase
-      let syntax = builder.buildSyntax(format: format, leadingTrivia: .zero)
-
-      var text = ""
-      syntax.write(to: &text)
-
-      XCTAssertEqual(text, expected, line: line)
+  func testEmptyStruct() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
+    let buildable = Struct("TestStruct")
+    let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
+
+    var text = ""
+    syntax.write(to: &text)
+
+    XCTAssertEqual(text, """
+    ␣struct TestStruct {
+    }
+    """)
+  }
+
+  func testStructWithMember() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
+    let buildable = Struct("TestStruct") {
+      Let("member", of: "String")
+    }
+    let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
+
+    var text = ""
+    syntax.write(to: &text)
+
+    XCTAssertEqual(text, """
+    ␣struct TestStruct {
+        let member: String
     }
+    """)
+  }
+
+  func testNestedStruct() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
+    let buildable = Struct("TestStruct") {
+      Struct("NestedStruct") {
+          Let("member", of: "String")
+      }
+    }
+    let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
+
+    var text = ""
+    syntax.write(to: &text)
+
+    XCTAssertEqual(text, """
+    ␣struct TestStruct {
+        struct NestedStruct {
+            let member: String
+        }
+    }
+    """)
+  }
+
+  func testStructWithIndent() {
+    let format = Format().indented()
+
+    let buildable = Struct("TestStruct") {
+      Let("member", of: "String")
+    }
+    let syntax = buildable.buildSyntax(format: format, leadingTrivia: format.makeIndent())
+
+    var text = ""
+    syntax.write(to: &text)
+
+    XCTAssertEqual(text, """
+        struct TestStruct {
+            let member: String
+        }
+    """)
   }
 }

Tests/SwiftSyntaxBuilderTest/VariableTests.swift

@@ -4,21 +4,21 @@ import SwiftSyntax
 @testable import SwiftSyntaxBuilder
 
 final class VariableTests: XCTestCase {
-  let format = Format(indentWidth: 2).indented()
-
   func testLet() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
     let testCases: [UInt: (Let, String)] = [
       #line: (Let("str", of: "String"),
-              #"  let str: String"#),
+              #"␣let str: String"#),
       #line: (Let("str", of: "String", value: StringLiteral("asdf")),
-              #"  let str: String = "asdf""#),
+              #"␣let str: String = "asdf""#),
       #line: (Let("num", of: "Int", value: IntegerLiteral(123)),
-              #"  let num: Int = 123"#),
+              #"␣let num: Int = 123"#),
     ]
 
     for (line, testCase) in testCases {
       let (builder, expected) = testCase
-      let syntax = builder.buildSyntax(format: format, leadingTrivia: .zero)
+      let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
 
       var text = ""
       syntax.write(to: &text)
@@ -28,18 +28,20 @@ final class VariableTests: XCTestCase {
   }
 
   func testVar() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
     let testCases: [UInt: (Var, String)] = [
       #line: (Var("str", of: "String"),
-              #"  var str: String"#),
+              #"␣var str: String"#),
       #line: (Var("str", of: "String", value: StringLiteral("asdf")),
-              #"  var str: String = "asdf""#),
+              #"␣var str: String = "asdf""#),
       #line: (Var("num", of: "Int", value: IntegerLiteral(123)),
-              #"  var num: Int = 123"#),
+              #"␣var num: Int = 123"#),
     ]
 
     for (line, testCase) in testCases {
       let (builder, expected) = testCase
-      let syntax = builder.buildSyntax(format: format, leadingTrivia: .zero)
+      let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
 
       var text = ""
       syntax.write(to: &text)