Skip to content

Commit f4367f0

Browse files
authored
Merge pull request #205 from dylansturg/fix_testable
Remove @testable imports, upgrading symbols to public visibility.
2 parents 8f52d5c + 7942e85 commit f4367f0

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

Sources/SwiftFormat/SwiftFormatter.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public final class SwiftFormatter {
101101
syntax: SourceFileSyntax, assumingFileURL url: URL?, source: String?,
102102
to outputStream: inout Output
103103
) throws {
104-
if let position = firstInvalidSyntaxPosition(in: Syntax(syntax)) {
104+
if let position = _firstInvalidSyntaxPosition(in: Syntax(syntax)) {
105105
throw SwiftFormatError.fileContainsInvalidSyntax(position: position)
106106
}
107107

Sources/SwiftFormat/SwiftLinter.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public final class SwiftLinter {
8282
}
8383

8484
private func lint(syntax: SourceFileSyntax, assumingFileURL url: URL, source: String?) throws {
85-
if let position = firstInvalidSyntaxPosition(in: Syntax(syntax)) {
85+
if let position = _firstInvalidSyntaxPosition(in: Syntax(syntax)) {
8686
throw SwiftFormatError.fileContainsInvalidSyntax(position: position)
8787
}
8888

Sources/SwiftFormat/SyntaxValidatingVisitor.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fileprivate class SyntaxValidatingVisitor: SyntaxVisitor {
6868
/// syntax is valid.
6969
///
7070
/// - Parameter syntax: The root of a tree of syntax nodes to check for compatibility.
71-
func firstInvalidSyntaxPosition(in syntax: Syntax) -> AbsolutePosition? {
71+
public func _firstInvalidSyntaxPosition(in syntax: Syntax) -> AbsolutePosition? {
7272
let visitor = SyntaxValidatingVisitor()
7373
visitor.walk(syntax)
7474
return visitor.invalidSyntaxStartPosition

Tests/SwiftFormatTests/SyntaxValidatingVisitorTests.swift

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
import SwiftFormat
12
import SwiftSyntax
23
import XCTest
34

4-
@testable import SwiftFormat
5-
65
final class SyntaxValidatingVisitorTests: XCTestCase {
76
func testValidSyntax() {
87
let input =
@@ -18,7 +17,7 @@ final class SyntaxValidatingVisitorTests: XCTestCase {
1817
@unknown default: break
1918
}
2019
"""
21-
XCTAssertNil(firstInvalidSyntaxPosition(in: createSyntax(from: input)))
20+
XCTAssertNil(_firstInvalidSyntaxPosition(in: createSyntax(from: input)))
2221
}
2322

2423
func testInvalidSyntax() {
@@ -56,7 +55,7 @@ final class SyntaxValidatingVisitorTests: XCTestCase {
5655
private func assertInvalidSyntax(
5756
in source: String, atLine: Int, column: Int, file: StaticString = #file, line: UInt = #line
5857
) {
59-
guard let position = firstInvalidSyntaxPosition(in: createSyntax(from: source)) else {
58+
guard let position = _firstInvalidSyntaxPosition(in: createSyntax(from: source)) else {
6059
XCTFail("No invalid syntax was found", file: file, line: line)
6160
return
6261
}

0 commit comments

Comments
 (0)