Skip to content

Fix leading newline in source file syntax #1351

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
Feb 20, 2023
Merged

Fix leading newline in source file syntax #1351

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 CodeGeneration/Sources/generate-swiftsyntax/templates/basicformat/BasicFormatFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ let basicFormatFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(fo
indentationLevel += 1
}
if let parent = node.parent, childrenSeparatedByNewline(parent) {
putNextTokenOnNewLine = true
putNextTokenOnNewLine = true && node.previousToken != nil
}
}
"""
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftBasicFormat/generated/BasicFormat.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ open class BasicFormat: SyntaxRewriter {
indentationLevel += 1
}
if let parent = node.parent, childrenSeparatedByNewline(parent) {
putNextTokenOnNewLine = true
putNextTokenOnNewLine = true && node.previousToken != nil
}
}

Expand Down
4 changes: 2 additions & 2 deletions Tests/SwiftSyntaxBuilderTest/SourceFileTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ final class SourceFileTests: XCTestCase {
AssertBuildResult(
source,
"""

import Foundation
import UIKit
class SomeViewController {
let tableView: UITableView
}
"""
""",
trimTrailingWhitespace: false
)
}
}
2 changes: 0 additions & 2 deletions Tests/SwiftSyntaxBuilderTest/StringInterpolationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ final class StringInterpolationTests: XCTestCase {
"""
func plusOne(base: Int) -> Int {
switch base {

case 0:
return 1
case 1:
Expand Down Expand Up @@ -323,7 +322,6 @@ final class StringInterpolationTests: XCTestCase {
"""
func plusOne(base: Int) -> Int {
switch base {

case 0:
return 1
case 1:
Expand Down