diff --git a/pkl-formatter/src/main/kotlin/org/pkl/formatter/Builder.kt b/pkl-formatter/src/main/kotlin/org/pkl/formatter/Builder.kt index 37d8e17e..94fd0bef 100644 --- a/pkl-formatter/src/main/kotlin/org/pkl/formatter/Builder.kt +++ b/pkl-formatter/src/main/kotlin/org/pkl/formatter/Builder.kt @@ -183,14 +183,14 @@ internal class Builder(sourceText: String, private val grammarVersion: GrammarVe private fun formatModuleDefinition(node: Node): FormatNode { val (prefixes, nodes) = splitPrefixes(node.children) val fnodes = - formatGenericWithGen(nodes, spaceOrLine()) { node, next -> - if (next == null) { - indent(format(node)) + formatGenericWithGen(nodes, Space) { node, _ -> + if (node.type == NodeType.QUALIFIED_IDENTIFIER) { + Nodes(formatGeneric(node.children, null)) } else { format(node) } } - val res = Group(newId(), fnodes) + val res = Nodes(fnodes) return if (prefixes.isEmpty()) { res } else { diff --git a/pkl-formatter/src/test/files/FormatterSnippetTests/output/line-breaks2.pkl b/pkl-formatter/src/test/files/FormatterSnippetTests/output/line-breaks2.pkl index e1fbb341..ca0825cf 100644 --- a/pkl-formatter/src/test/files/FormatterSnippetTests/output/line-breaks2.pkl +++ b/pkl-formatter/src/test/files/FormatterSnippetTests/output/line-breaks2.pkl @@ -1,7 +1,4 @@ -module - reaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaly - .loooooooooooooooooooooooooooooooog - .naaaaaaaaaaaaaaaaaaaaaaaaaame +module reaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaly.loooooooooooooooooooooooooooooooog.naaaaaaaaaaaaaaaaaaaaaaaaaame extends "reaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongModule.pkl" diff --git a/pkl-formatter/src/test/files/FormatterSnippetTests/output/line-width.pkl b/pkl-formatter/src/test/files/FormatterSnippetTests/output/line-width.pkl index 69ab9844..d354ae64 100644 --- a/pkl-formatter/src/test/files/FormatterSnippetTests/output/line-width.pkl +++ b/pkl-formatter/src/test/files/FormatterSnippetTests/output/line-width.pkl @@ -1,7 +1,4 @@ -module - reaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaly - .loooooooooooooooooooooooooooooooog - .naaaaaaaaaaaaaaaaaaaaaaaaaaaaame +module reaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaly.loooooooooooooooooooooooooooooooog.naaaaaaaaaaaaaaaaaaaaaaaaaaaaame extends "reaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongModule.pkl"