Fixes

Author: bioball

pkl-formatter/src/main/kotlin/org/pkl/formatter/Builder.kt

@@ -596,7 +596,9 @@ internal class Builder(sourceText: String, private val grammarVersion: GrammarVe
     twoBy2: Boolean = false,
   ): FormatNode {
     val children = node.children
-    val sep = if (node.isMultiline()) forceSpaceyLine() else spaceOrLine()
+    val sep: (Node, Node) -> FormatNode = { prev, next ->
+      if (prev.isTerminal(",") && prev.linesBetween(next) > 0) forceSpaceyLine() else spaceOrLine()
+    }
     return if (twoBy2) {
       val pairs = pairArguments(children)
       val nodes =
@@ -609,17 +611,17 @@ internal class Builder(sourceText: String, private val grammarVersion: GrammarVe
         }
       Indent(nodes)
     } else if (hasTrailingLambda) {
-      // if the args have a trailing expression (lambda, new, amends) group them differently
+      // if the args have a trailing lambda, group them differently
       val splitIndex = children.indexOfLast { it.type in SAME_LINE_EXPRS }
       val normalParams = children.subList(0, splitIndex)
       val lastParam = children.subList(splitIndex, children.size)
       val trailingNode = if (endsWithClosingBracket(children[splitIndex])) Empty else line()
-      val lastNodes = formatGeneric(lastParam, sep)
+      val lastNodes = formatGenericWithGen(lastParam, sep, null)
       if (normalParams.isEmpty()) {
         nodes(Group(newId(), lastNodes), trailingNode)
       } else {
         val separator = getSeparator(normalParams.last(), lastParam[0], Space)
-        val paramNodes = formatGeneric(normalParams, sep)
+        val paramNodes = formatGenericWithGen(normalParams, sep, null)
         nodes(Group(newId(), paramNodes), separator, Group(newId(), lastNodes), trailingNode)
       }
     } else {

pkl-formatter/src/test/files/FormatterSnippetTests/input/line-breaks3.pkl

@@ -34,3 +34,8 @@ res6 = foo.bar(
 res7 = foo + bar(
       3
     ) + baz
+
+res8 = Map(
+  1, 2,
+  3, 4
+)

pkl-formatter/src/test/files/FormatterSnippetTests/output/line-breaks.pkl

@@ -49,10 +49,7 @@ funcParam2 =
 funcParam3 = aFun(foo, 10 * 10, anotherVariable, 200000, (param1, param2) -> param1 * param2)
 
 funcParam4 =
-  aFun(foo,
-  10 * 10,
-  anotherVariable,
-  if (true) 100000 else 200000, new Listing {
+  aFun(foo, 10 * 10, anotherVariable, if (true) 100000 else 200000, new Listing {
     1
     2
   })

pkl-formatter/src/test/files/FormatterSnippetTests/output/line-breaks3.pkl

@@ -34,5 +34,13 @@ res5 =
 // don't respect newlines right after opening paren and closing paren
 res6 = foo.bar(1, 2, 3)
 
-// only respect newlines between binary operators (we still want to inline `bar(3)` here).
+// only respect newlines on either side of a binary operator (we still want to inline `bar(3)` here).
 res7 = foo + bar(3) + baz
+
+res8 =
+  Map(
+    1, 2,
+    3, 4,
+  )
+
+res9 = Map(1, 2, 3, 4)