Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 18 additions & 3 deletions Sources/SwiftBasicFormat/BasicFormat.swift
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,19 @@ open class BasicFormat: SyntaxRewriter {
return trailingTrivia + Trivia(pieces: nextTokenLeadingWhitespace)
}()

/// Whether the leading trivia of the token is folloed by a newline.
let leadingTriviaIsFollowedByNewline: Bool = {
if token.text.isEmpty && token.trailingTrivia.startsWithNewline {
return true
} else if token.text.first?.isNewline ?? false {
return true
} else if token.text.isEmpty && token.trailingTrivia.isEmpty && nextTokenWillStartWithNewline {
return true
} else {
return false
}
}()

var leadingTrivia = token.leadingTrivia
var trailingTrivia = token.trailingTrivia

Expand All @@ -455,9 +468,11 @@ open class BasicFormat: SyntaxRewriter {
}
}

if leadingTrivia.indentation(isOnNewline: isInitialToken || previousTokenWillEndWithNewline) == [] {
let isEmptyLine = token.leadingTrivia.isEmpty && leadingTriviaIsFollowedByNewline
if leadingTrivia.indentation(isOnNewline: isInitialToken || previousTokenWillEndWithNewline) == [] && !isEmptyLine {
// If the token starts on a new line and does not have indentation, this
// is the last non-indented token. Store its indentation level
// is the last non-indented token. Store its indentation level.
// Do not store the indentation level if the line is empty.
anchorPoints[token] = currentIndentationLevel
}

Expand Down Expand Up @@ -501,7 +516,7 @@ open class BasicFormat: SyntaxRewriter {
leadingTrivia = leadingTrivia.indented(indentation: leadingTriviaIndentation, isOnNewline: previousTokenIsStringLiteralEndingInNewline)
trailingTrivia = trailingTrivia.indented(indentation: trailingTriviaIndentation, isOnNewline: false)

leadingTrivia = leadingTrivia.trimmingTrailingWhitespaceBeforeNewline(isBeforeNewline: false)
leadingTrivia = leadingTrivia.trimmingTrailingWhitespaceBeforeNewline(isBeforeNewline: leadingTriviaIsFollowedByNewline)
trailingTrivia = trailingTrivia.trimmingTrailingWhitespaceBeforeNewline(isBeforeNewline: nextTokenWillStartWithNewline)

if leadingTrivia == token.leadingTrivia && trailingTrivia == token.trailingTrivia {
Expand Down
21 changes: 21 additions & 0 deletions Tests/SwiftBasicFormatTest/BasicFormatTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,27 @@ final class BasicFormatTest: XCTestCase {
)
}

func testMultilineStringLiteralWithBlackLines() {
assertFormatted(
source: #"""
assertionFailure("""
First line

Second line

""")
"""#,
expected: #"""
assertionFailure("""
First line

Second line

""")
"""#
)
}

func testNestedUserDefinedIndentation() {
assertFormatted(
source: """
Expand Down