Skip to content

Commit fed652b

Browse files
committed
Make methods of Format public for testing
1 parent a115d95 commit fed652b

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

Sources/SwiftSyntaxBuilder/DeclBuildables.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public struct Struct: DeclBuildable {
160160
let structKeyword = Tokens.struct.withLeadingTrivia(leadingTrivia)
161161

162162
let declList = memberList.buildDeclList(
163-
format: format.indented(),
163+
format: format._indented(),
164164
leadingTrivia: .zero
165165
)
166166

@@ -169,13 +169,13 @@ public struct Struct: DeclBuildable {
169169
$0.useIdentifier(SyntaxFactory.makeIdentifier(name))
170170
$0.useMembers(MemberDeclBlockSyntax {
171171
$0.useLeftBrace(Tokens.leftBrace.withLeadingTrivia(.spaces(1)))
172-
$0.useRightBrace(Tokens.rightBrace.withLeadingTrivia(.newlines(1) + format.makeIndent()))
172+
$0.useRightBrace(Tokens.rightBrace.withLeadingTrivia(.newlines(1) + format._makeIndent()))
173173

174-
let format = format.indented()
174+
let format = format._indented()
175175
for decl in declList {
176176
let member = SyntaxFactory
177177
.makeMemberDeclListItem(decl: decl, semicolon: nil)
178-
.withLeadingTrivia(.newlines(1) + format.makeIndent())
178+
.withLeadingTrivia(.newlines(1) + format._makeIndent())
179179
$0.addMember(member)
180180
}
181181
})

Sources/SwiftSyntaxBuilder/Format.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public struct Format {
2323
}
2424

2525
extension Format {
26-
func indented() -> Format {
26+
public func _indented() -> Format {
2727
var copy = self
2828
copy.indents += 1
2929
return copy
3030
}
3131

32-
func makeIndent() -> Trivia {
32+
public func _makeIndent() -> Trivia {
3333
return indents == 0 ? .zero : Trivia.spaces(indents * indentWidth)
3434
}
3535
}

Sources/SwiftSyntaxBuilder/SyntaxBuildables.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public struct SourceFile: SyntaxBuildable {
7171
for (index, syntax) in syntaxList.enumerated() {
7272
let trivia: Trivia =
7373
index == syntaxList.startIndex
74-
? format.makeIndent()
75-
: .newlines(1) + format.makeIndent()
74+
? format._makeIndent()
75+
: .newlines(1) + format._makeIndent()
7676

7777
$0.addStatement(CodeBlockItemSyntax {
7878
$0.useItem(syntax)
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import XCTest
22
import SwiftSyntax
33

4-
@testable import SwiftSyntaxBuilder
4+
import SwiftSyntaxBuilder
55

66
final class FormatTests: XCTestCase {
7-
func testMakeIndented() {
7+
func test_makeIndented() {
88
for width in 1 ... 4 {
99
let format = Format(indentWidth: width)
1010

11-
XCTAssertEqual(format.makeIndent(), .zero)
12-
XCTAssertEqual(format.indented().makeIndent(), .spaces(width))
13-
XCTAssertEqual(format.indented().indented().makeIndent(), .spaces(width * 2))
11+
XCTAssertEqual(format._makeIndent(), .zero)
12+
XCTAssertEqual(format._indented()._makeIndent(), .spaces(width))
13+
XCTAssertEqual(format._indented()._indented()._makeIndent(), .spaces(width * 2))
1414
}
1515
}
1616
}

Tests/SwiftSyntaxBuilderTest/ImportTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import XCTest
22
import SwiftSyntax
33

4-
@testable import SwiftSyntaxBuilder
4+
import SwiftSyntaxBuilder
55

66
final class ImportTests: XCTestCase {
77
func testImport() {

Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import XCTest
22
import SwiftSyntax
33

4-
@testable import SwiftSyntaxBuilder
4+
import SwiftSyntaxBuilder
55

66
final class IntegerLiteralTests: XCTestCase {
77
func testIntegerLiteral() {

Tests/SwiftSyntaxBuilderTest/SourceFileTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import XCTest
22
import SwiftSyntax
33

4-
@testable import SwiftSyntaxBuilder
4+
import SwiftSyntaxBuilder
55

66
final class SourceFileTests: XCTestCase {
77
func testSourceFile() {

Tests/SwiftSyntaxBuilderTest/StringLiteralTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import XCTest
22
import SwiftSyntax
33

4-
@testable import SwiftSyntaxBuilder
4+
import SwiftSyntaxBuilder
55

66
final class StringLiteralTests: XCTestCase {
77
func testStringLiteral() {

Tests/SwiftSyntaxBuilderTest/StructTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import XCTest
22
import SwiftSyntax
33

4-
@testable import SwiftSyntaxBuilder
4+
import SwiftSyntaxBuilder
55

66
final class StructTests: XCTestCase {
77
func testEmptyStruct() {
@@ -60,12 +60,12 @@ final class StructTests: XCTestCase {
6060
}
6161

6262
func testStructWithIndent() {
63-
let format = Format().indented()
63+
let format = Format()._indented()
6464

6565
let buildable = Struct("TestStruct") {
6666
Let("member", of: "String")
6767
}
68-
let syntax = buildable.buildSyntax(format: format, leadingTrivia: format.makeIndent())
68+
let syntax = buildable.buildSyntax(format: format, leadingTrivia: format._makeIndent())
6969

7070
var text = ""
7171
syntax.write(to: &text)

Tests/SwiftSyntaxBuilderTest/VariableTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import XCTest
22
import SwiftSyntax
33

4-
@testable import SwiftSyntaxBuilder
4+
import SwiftSyntaxBuilder
55

66
final class VariableTests: XCTestCase {
77
func testLet() {

0 commit comments

Comments
 (0)