Skip to content

Remove @testable imports, upgrading symbols to public visibility. #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2020
Merged

Remove @testable imports, upgrading symbols to public visibility. #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/SwiftFormat/SwiftFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public final class SwiftFormatter {
syntax: SourceFileSyntax, assumingFileURL url: URL?, source: String?,
to outputStream: inout Output
) throws {
if let position = firstInvalidSyntaxPosition(in: Syntax(syntax)) {
if let position = _firstInvalidSyntaxPosition(in: Syntax(syntax)) {
throw SwiftFormatError.fileContainsInvalidSyntax(position: position)
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftFormat/SwiftLinter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public final class SwiftLinter {
}

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

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftFormat/SyntaxValidatingVisitor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fileprivate class SyntaxValidatingVisitor: SyntaxVisitor {
/// syntax is valid.
///
/// - Parameter syntax: The root of a tree of syntax nodes to check for compatibility.
func firstInvalidSyntaxPosition(in syntax: Syntax) -> AbsolutePosition? {
public func _firstInvalidSyntaxPosition(in syntax: Syntax) -> AbsolutePosition? {
let visitor = SyntaxValidatingVisitor()
visitor.walk(syntax)
return visitor.invalidSyntaxStartPosition
Expand Down
7 changes: 3 additions & 4 deletions Tests/SwiftFormatTests/SyntaxValidatingVisitorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import SwiftFormat
import SwiftSyntax
import XCTest

@testable import SwiftFormat

final class SyntaxValidatingVisitorTests: XCTestCase {
func testValidSyntax() {
let input =
Expand All @@ -18,7 +17,7 @@ final class SyntaxValidatingVisitorTests: XCTestCase {
@unknown default: break
}
"""
XCTAssertNil(firstInvalidSyntaxPosition(in: createSyntax(from: input)))
XCTAssertNil(_firstInvalidSyntaxPosition(in: createSyntax(from: input)))
}

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