Skip to content

Update to reflect changes on swift-syntax/main #435

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
Oct 23, 2022
Merged

Update to reflect changes on swift-syntax/main #435

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
1 change: 1 addition & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ let package = Package(
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftOperators", package: "swift-syntax"),
.product(name: "SwiftParser", package: "swift-syntax"),
.product(name: "SwiftParserDiagnostics", package: "swift-syntax"),
]
),
.target(
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftFormat/Parsing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import SwiftDiagnostics
import SwiftFormatCore
import SwiftOperators
import SwiftParser
import SwiftParserDiagnostics
import SwiftSyntax

/// Parses the given source code and returns a valid `SourceFileSyntax` node.
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftFormatCore/LegacyTriviaBehavior.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import SwiftSyntax
/// Eventually we should get rid of this and update the core formatting code to adjust to the new
/// behavior, but this workaround lets us keep the current implementation without larger changes.
public func restoringLegacyTriviaBehavior(_ sourceFile: SourceFileSyntax) -> SourceFileSyntax {
return LegacyTriviaBehaviorRewriter().visit(sourceFile).as(SourceFileSyntax.self)!
return LegacyTriviaBehaviorRewriter().visit(sourceFile)
}

private final class LegacyTriviaBehaviorRewriter: SyntaxRewriter {
Expand Down