Skip to content

Fix CodeGenerationFormat to correctly handle trailing trivia when formatting list elements #2864

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 2 commits into from
Nov 12, 2024
Merged

Fix CodeGenerationFormat to correctly handle trailing trivia when formatting list elements #2864

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac4a1f2
Change `CodeGenerationFormat` to keep whitespace after comma if it pr…
roopekv Sep 16, 2024
7c4f03a
Fix `CodeGenerationFormat` to keep existing trailing trivia when addi…
roopekv Sep 28, 2024
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
15 changes: 12 additions & 3 deletions CodeGeneration/Sources/Utils/CodeGenerationFormat.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,21 +158,30 @@ public class CodeGenerationFormat: BasicFormat {
}
formattedChildren = formattedChildren.map { child in
var child = child
child.trailingTrivia = Trivia(pieces: child.trailingTrivia.drop(while: \.isSpaceOrTab))

if let firstNonSpaceOrTabIndex = child.trailingTrivia.firstIndex(where: { !$0.isSpaceOrTab }) {
if child.trailingTrivia[firstNonSpaceOrTabIndex].isNewline {
child.trailingTrivia = Trivia(pieces: child.trailingTrivia.suffix(from: firstNonSpaceOrTabIndex))
}
} else {
child.trailingTrivia = Trivia()
}

if !child.startsOnNewline {
child.leadingTrivia = indentedNewline + child.leadingTrivia
}
return child
}
decreaseIndentationLevel()
if let lastChild = formattedChildren.last {
if let lastChild = formattedChildren.last,
!lastChild.trailingTrivia.contains(where: \.isNewline)
{
let nextTokenStartsWithNewline =
lastChild.nextToken(viewMode: .sourceAccurate)?.leadingTrivia.first?.isNewline ?? false
if !nextTokenStartsWithNewline {
formattedChildren[formattedChildren.count - 1] = lastChild.with(
\.trailingTrivia,
indentedNewline
lastChild.trailingTrivia + indentedNewline
)
}
}
Expand Down