Skip to content

Commit 1d832c7

Browse files
fwcdfwcd
committed
Fix tests
Since we no longer pass a separate leadingTrivia through the syntax build, we attach the leadingTrivia directly to the buildable node where possible and omit it elsewhere.
1 parent 7784d6c commit 1d832c7

21 files changed

+105
-126
lines changed

‎Tests/SwiftSyntaxBuilderTest/ArrayExprTests.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ import SwiftSyntaxBuilder
44

55
final class ArrayExprTests: XCTestCase {
66
func testArrayExpr() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
97
let testCases: [UInt: (ExpressibleAsArrayExpr, String)] = [
10-
#line: (ArrayElementList(), "␣[]"),
11-
#line: (ArrayElementList([ArrayElement(expression: IdentifierExpr("SomeIdenfier"))]), "␣[SomeIdenfier]"),
12-
#line: (ArrayElement(expression: IdentifierExpr("SomeIdenfier")), "␣[SomeIdenfier]"),
8+
#line: (ArrayElementList(), "[]"),
9+
#line: (ArrayElementList([ArrayElement(expression: IdentifierExpr("SomeIdenfier"))]), "[SomeIdenfier]"),
10+
#line: (ArrayElement(expression: IdentifierExpr("SomeIdenfier")), "[SomeIdenfier]"),
1311
]
1412

1513
for (line, testCase) in testCases {
1614
let (builder, expected) = testCase
1715
let arrowExpr = builder.createArrayExpr()
18-
let syntax = arrowExpr.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
16+
let syntax = arrowExpr.buildSyntax(format: Format())
1917

2018
var text = ""
2119
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/ArrowExprTests.swift

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@ import SwiftSyntaxBuilder
44

55
final class ArrowExprTests: XCTestCase {
66
func testArrowExpr() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
97
let testCases: [UInt: (ExpressibleAsArrowExpr, String)] = [
10-
#line: (ArrowExpr(), "␣ -> "),
11-
#line: (ArrowExpr(asyncKeyword: "async"), "␣async -> ")
8+
#line: (ArrowExpr(), " -> "),
9+
#line: (ArrowExpr(asyncKeyword: "async"), "async -> ")
1210
]
1311

1412
for (line, testCase) in testCases {
1513
let (builder, expected) = testCase
1614
let arrowExpr = builder.createArrowExpr()
17-
let syntax = arrowExpr.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
15+
let syntax = arrowExpr.buildSyntax(format: Format())
1816

1917
var text = ""
2018
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/BinaryOperatorExprTests.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ import SwiftSyntaxBuilder
44

55
final class BinaryOperatorExprTests: XCTestCase {
66
func testBinaryOperatorExprConvenienceInitializers() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
87
let testCases: [UInt: (ExpressibleAsBinaryOperatorExpr, String)] = [
9-
#line: (BinaryOperatorExpr("=="), "␣ == "),
10-
#line: (TokenSyntax.unspacedBinaryOperator("=="), "␣=="),
11-
#line: ("==", "␣ == "),
8+
#line: (BinaryOperatorExpr("=="), " == "),
9+
#line: (TokenSyntax.unspacedBinaryOperator("=="), "=="),
10+
#line: ("==", " == "),
1211
]
1312

1413
for (line, testCase) in testCases {
1514
let (builder, expected) = testCase
1615
let binaryOperatorExpr = builder.createBinaryOperatorExpr()
17-
let syntax = binaryOperatorExpr.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
16+
let syntax = binaryOperatorExpr.buildSyntax(format: Format())
1817

1918
var text = ""
2019
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/BooleanLiteralTests.swift

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@ import SwiftSyntaxBuilder
44

55
final class BooleanLiteralTests: XCTestCase {
66
func testBooleanLiteral() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
97
let testCases: [UInt: (BooleanLiteralExpr, String)] = [
10-
#line: (BooleanLiteralExpr(booleanLiteral: .true), "␣true"),
11-
#line: (BooleanLiteralExpr(booleanLiteral: .false), "␣false"),
12-
#line: (BooleanLiteralExpr(true), "␣true"),
13-
#line: (BooleanLiteralExpr(false), "␣false"),
14-
#line: (true, "␣true"),
15-
#line: (false, "␣false")
8+
#line: (BooleanLiteralExpr(booleanLiteral: .true), "true"),
9+
#line: (BooleanLiteralExpr(booleanLiteral: .false), "false"),
10+
#line: (BooleanLiteralExpr(true), "true"),
11+
#line: (BooleanLiteralExpr(false), "false"),
12+
#line: (true, "true"),
13+
#line: (false, "false")
1614
]
1715

1816
for (line, testCase) in testCases {
1917
let (builder, expected) = testCase
20-
let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
18+
let syntax = builder.buildSyntax(format: Format())
2119

2220
var text = ""
2321
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/CollectionNodeFlatteningTests.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class CollectionNodeFlatteningTests: XCTestCase {
1919
buildInnerCodeBlockItemList()
2020
}
2121

22-
let codeBlock = CodeBlock {
22+
let codeBlock = CodeBlock(leadingTrivia: leadingTrivia) {
2323
FunctionCallExpr("outsideBuilder")
2424
buildOuterCodeBlockItemList()
2525
}
2626

27-
let test = codeBlock.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
27+
let test = codeBlock.buildSyntax(format: Format())
2828

2929
var result = ""
3030
test.write(to: &result)
@@ -54,6 +54,7 @@ final class CollectionNodeFlatteningTests: XCTestCase {
5454
}
5555

5656
let codeBlock = CodeBlock(
57+
leadingTrivia: leadingTrivia,
5758
statements: CodeBlockItemList(
5859
combining: [
5960
CodeBlockItemList([FunctionCallExpr("outsideBuilder")]),
@@ -62,7 +63,7 @@ final class CollectionNodeFlatteningTests: XCTestCase {
6263
)
6364
)
6465

65-
let test = codeBlock.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
66+
let test = codeBlock.buildSyntax(format: Format())
6667

6768
var result = ""
6869
test.write(to: &result)

‎Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ final class EnumCaseElementTests: XCTestCase {
66
func testEnumInit() {
77
let leadingTrivia = Trivia.unexpectedText("␣")
88
let buildable = EnumDecl(
9+
leadingTrivia: leadingTrivia,
910
identifier: "Greeting",
1011
inheritanceClause: TypeInheritanceClause {
1112
InheritedType(typeName: "String")
@@ -23,7 +24,7 @@ final class EnumCaseElementTests: XCTestCase {
2324
EnumCaseElement(identifier: "hi")
2425
}
2526
}
26-
let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
27+
let syntax = buildable.buildSyntax(format: Format())
2728

2829
XCTAssertEqual(syntax.description,
2930
"""

‎Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@ import SwiftSyntaxBuilder
44

55
final class FloatLiteralTests: XCTestCase {
66
func testFloatLiteral() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
97
let testCases: [UInt: (FloatLiteralExpr, String)] = [
10-
#line: (FloatLiteralExpr(floatingDigits: .floatingLiteral(String(123.321))), "␣123.321"),
11-
#line: (FloatLiteralExpr(floatingDigits: .floatingLiteral(String(-123.321))), "␣-123.321"),
12-
#line: (FloatLiteralExpr(floatingDigits: "2_123.321"), "␣2_123.321"),
13-
#line: (FloatLiteralExpr(floatingDigits: "-2_123.321"), "␣-2_123.321"),
14-
#line: (FloatLiteralExpr(2_123.321), "␣2123.321"),
15-
#line: (FloatLiteralExpr(-2_123.321), "␣-2123.321"),
16-
#line: (2_123.321, "␣2123.321"),
17-
#line: (-2_123.321, "␣-2123.321")
8+
#line: (FloatLiteralExpr(floatingDigits: .floatingLiteral(String(123.321))), "123.321"),
9+
#line: (FloatLiteralExpr(floatingDigits: .floatingLiteral(String(-123.321))), "-123.321"),
10+
#line: (FloatLiteralExpr(floatingDigits: "2_123.321"), "2_123.321"),
11+
#line: (FloatLiteralExpr(floatingDigits: "-2_123.321"), "-2_123.321"),
12+
#line: (FloatLiteralExpr(2_123.321), "2123.321"),
13+
#line: (FloatLiteralExpr(-2_123.321), "-2123.321"),
14+
#line: (2_123.321, "2123.321"),
15+
#line: (-2_123.321, "-2123.321")
1816
]
1917

2018
for (line, testCase) in testCases {
2119
let (builder, expected) = testCase
22-
let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
20+
let syntax = builder.buildSyntax(format: Format())
2321

2422
var text = ""
2523
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/FunctionTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ final class FunctionTests: XCTestCase {
1414

1515
let signature = FunctionSignature(input: input, output: "Int")
1616

17-
let buildable = FunctionDecl(identifier: .identifier("fibonacci"), signature: signature) {
17+
let buildable = FunctionDecl(leadingTrivia: leadingTrivia, identifier: .identifier("fibonacci"), signature: signature) {
1818
IfStmt(
1919
conditions: ExprList {
2020
IntegerLiteralExpr(digits: "n")
@@ -43,7 +43,7 @@ final class FunctionTests: XCTestCase {
4343
}
4444
})
4545
}
46-
let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
46+
let syntax = buildable.buildSyntax(format: Format())
4747

4848
XCTAssertEqual(syntax.description, """
4949
␣func fibonacci(_ n: Int) -> Int {

‎Tests/SwiftSyntaxBuilderTest/IdentifierExprTests.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ import SwiftSyntaxBuilder
44

55
final class IdentifierExprTests: XCTestCase {
66
func testStringLiteral() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
97
let testCases: [UInt: (ExpressibleAsIdentifierExpr, String)] = [
10-
#line: (IdentifierExpr(identifier: .identifier("Test")), "␣Test"),
11-
#line: (IdentifierExpr("Test"), "␣Test"),
12-
#line: ("Test", "␣Test")
8+
#line: (IdentifierExpr(identifier: .identifier("Test")), "Test"),
9+
#line: (IdentifierExpr("Test"), "Test"),
10+
#line: ("Test", "Test")
1311
]
1412

1513
for (line, testCase) in testCases {
1614
let (builder, expected) = testCase
1715
let identifierExpr = builder.createIdentifierExpr()
18-
let syntax = identifierExpr.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
16+
let syntax = identifierExpr.buildSyntax(format: Format())
1917

2018
var text = ""
2119
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/IdentifierPatternTests.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ import SwiftSyntaxBuilder
44

55
final class IdentifierPatternTests: XCTestCase {
66
func testStringLiteral() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
97
let testCases: [UInt: (ExpressibleAsIdentifierPattern, String)] = [
10-
#line: (IdentifierPattern(identifier: .identifier("Test")), "␣Test"),
11-
#line: (IdentifierPattern("Test"), "␣Test"),
12-
#line: ("Test", "␣Test")
8+
#line: (IdentifierPattern(identifier: .identifier("Test")), "Test"),
9+
#line: (IdentifierPattern("Test"), "Test"),
10+
#line: ("Test", "Test")
1311
]
1412

1513
for (line, testCase) in testCases {
1614
let (builder, expected) = testCase
1715
let identifierPattern = builder.createIdentifierPattern()
18-
let syntax = identifierPattern.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
16+
let syntax = identifierPattern.buildSyntax(format: Format())
1917

2018
var text = ""
2119
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/ImportTests.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ final class ImportTests: XCTestCase {
77
let leadingTrivia = Trivia.unexpectedText("␣")
88
let identifier = TokenSyntax.identifier("SwiftSyntax")
99

10-
let importDecl = ImportDecl(path: AccessPath([AccessPathComponent(name: identifier)]))
10+
let importDecl = ImportDecl(
11+
leadingTrivia: leadingTrivia,
12+
path: AccessPath([AccessPathComponent(name: identifier)])
13+
)
1114

12-
let syntax = importDecl.buildDecl(format: Format(), leadingTrivia: leadingTrivia)
15+
let syntax = importDecl.buildDecl(format: Format())
1316

1417
var text = ""
1518
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@ import SwiftSyntaxBuilder
44

55
final class IntegerLiteralTests: XCTestCase {
66
func testIntegerLiteral() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
97
let testCases: [UInt: (IntegerLiteralExpr, String)] = [
10-
#line: (IntegerLiteralExpr(digits: .integerLiteral(String(123))), "␣123"),
11-
#line: (IntegerLiteralExpr(digits: .integerLiteral(String(-123))), "␣-123"),
12-
#line: (IntegerLiteralExpr(digits: "1_000"), "␣1_000"),
13-
#line: (IntegerLiteralExpr(digits: "-1_000"), "␣-1_000"),
14-
#line: (IntegerLiteralExpr(1_000), "␣1000"),
15-
#line: (IntegerLiteralExpr(-1_000), "␣-1000"),
16-
#line: (1_000, "␣1000"),
17-
#line: (-1_000, "␣-1000")
8+
#line: (IntegerLiteralExpr(digits: .integerLiteral(String(123))), "123"),
9+
#line: (IntegerLiteralExpr(digits: .integerLiteral(String(-123))), "-123"),
10+
#line: (IntegerLiteralExpr(digits: "1_000"), "1_000"),
11+
#line: (IntegerLiteralExpr(digits: "-1_000"), "-1_000"),
12+
#line: (IntegerLiteralExpr(1_000), "1000"),
13+
#line: (IntegerLiteralExpr(-1_000), "-1000"),
14+
#line: (1_000, "1000"),
15+
#line: (-1_000, "-1000")
1816
]
1917

2018
for (line, testCase) in testCases {
2119
let (builder, expected) = testCase
22-
let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
20+
let syntax = builder.buildSyntax(format: Format())
2321

2422
var text = ""
2523
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/MemberAccessTests.swift

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ import SwiftSyntaxBuilder
44

55
final class MemberAccessTests: XCTestCase {
66
func testMemberAccessExprConvenienceInitializers() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
9-
let builder = MemberAccessExpr(base: "Foo", name: "bar")
10-
let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
7+
let builder = MemberAccessExpr( base: "Foo", name: "bar")
8+
let syntax = builder.buildSyntax(format: Format())
119

1210
var text = ""
1311
syntax.write(to: &text)
1412

15-
XCTAssertEqual(text, "␣Foo.bar")
13+
XCTAssertEqual(text, "Foo.bar")
1614
}
1715
}

‎Tests/SwiftSyntaxBuilderTest/PrefixOperatorExprTests.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ import SwiftSyntaxBuilder
44

55
final class PrefixOperatorExprTests: XCTestCase {
66
func testPrefixOperatorExprConvenienceInitializers() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
87
let testCases: [UInt: (ExpressibleAsPrefixOperatorExpr, String)] = [
9-
#line: (PrefixOperatorExpr("!", "test"), "␣!test"),
10-
#line: (PrefixOperatorExpr("!", BooleanLiteralExpr(false)), "␣!false"),
11-
#line: (PrefixOperatorExpr("~", IntegerLiteralExpr(23)), "␣~23"),
8+
#line: (PrefixOperatorExpr("!", "test"), "!test"),
9+
#line: (PrefixOperatorExpr("!", BooleanLiteralExpr(false)), "!false"),
10+
#line: (PrefixOperatorExpr("~", IntegerLiteralExpr(23)), "~23"),
1211
]
1312

1413
for (line, testCase) in testCases {
1514
let (builder, expected) = testCase
1615
let expr = builder.createPrefixOperatorExpr()
17-
let syntax = expr.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
16+
let syntax = expr.buildSyntax(format: Format())
1817

1918
var text = ""
2019
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/ReturnClauseTests.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ import SwiftSyntaxBuilder
44

55
final class ReturnClauseTests: XCTestCase {
66
func testReturnClause() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
97
let testCases: [UInt: (ExpressibleAsReturnClause, String)] = [
10-
#line: (ReturnClause(returnType: "Int"), "␣ -> Int"),
11-
#line: (ArrayType(elementType: "Int"), "␣ -> [Int]"),
12-
#line: ("Int", "␣ -> Int"),
8+
#line: (ReturnClause(returnType: "Int"), " -> Int"),
9+
#line: (ArrayType(elementType: "Int"), " -> [Int]"),
10+
#line: ("Int", " -> Int"),
1311
]
1412

1513
for (line, testCase) in testCases {
1614
let (builder, expected) = testCase
1715
let returnClause = builder.createReturnClause()
18-
let syntax = returnClause.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
16+
let syntax = returnClause.buildSyntax(format: Format())
1917

2018
var text = ""
2119
syntax.write(to: &text)

‎Tests/SwiftSyntaxBuilderTest/SimpleTypeIdentifierTests.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ import SwiftSyntaxBuilder
44

55
final class SimpleTypeIdentifierTests: XCTestCase {
66
func testExpressibleAsSimpleTypeIdentifier() {
7-
let leadingTrivia = Trivia.unexpectedText("␣")
8-
97
let testCases: [UInt: (ExpressibleAsSimpleTypeIdentifier, String)] = [
10-
#line: (SimpleTypeIdentifier(name: .identifier("Foo")), "␣Foo"),
11-
#line: (SimpleTypeIdentifier("Foo"), "␣Foo"),
12-
#line: ("Foo", "␣Foo")
8+
#line: (SimpleTypeIdentifier(name: .identifier("Foo")), "Foo"),
9+
#line: (SimpleTypeIdentifier("Foo"), "Foo"),
10+
#line: ("Foo", "Foo")
1311
]
1412

1513
for (line, testCase) in testCases {
1614
let (builder, expected) = testCase
1715
let identifier = builder.createSimpleTypeIdentifier()
18-
let syntax = identifier.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
16+
let syntax = identifier.buildSyntax(format: Format())
1917

2018
var text = ""
2119
syntax.write(to: &text)

0 commit comments

Comments
 (0)