Skip to content

Fix formatting of nodes with no children #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
bioball merged 3 commits into from
Dec 9, 2025
Merged

Fix formatting of nodes with no children #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55a5aed
Fix formatting of nodes with no children
bioball Dec 5, 2025
f235a26
Update pkl-formatter/src/test/kotlin/org/pkl/formatter/FormatterTest.kt
bioball Dec 5, 2025
390f884
Simplify listOf(Empty) to emptyList()
bioball Dec 9, 2025
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 pkl-formatter/src/main/kotlin/org/pkl/formatter/Builder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,7 @@ internal class Builder(sourceText: String, private val grammarVersion: GrammarVe
// skip semicolons
val children = children.filter { !it.isSemicolon() }
// short circuit
if (children.isEmpty()) return listOf(spaceOrLine())
if (children.isEmpty()) return emptyList()
if (children.size == 1) return listOf(format(children[0]))

val nodes = mutableListOf<FormatNode>()
Expand Down
7 changes: 7 additions & 0 deletions pkl-formatter/src/test/kotlin/org/pkl/formatter/FormatterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,11 @@ class FormatterTest {

walkDir(outputDir)
}

@Test
fun `whitespace only`() {
for (src in listOf(";;;", "\n", "\n\n\n", "\t")) {
assertThat(format(src)).isEqualTo("\n")
}
}
}
Loading