Fix let formatting (#1246)

This commit is contained in:
Islon Scherer
2025-10-21 09:45:27 +02:00
committed by GitHub
parent 6c036bf82a
commit f6d3fb1228
6 changed files with 39 additions and 4 deletions
@@ -791,7 +791,7 @@ internal class Builder(sourceText: String) {
private fun formatLetParameterDefinition(node: Node): FormatNode { private fun formatLetParameterDefinition(node: Node): FormatNode {
val nodes = val nodes =
formatGeneric(node.children) { prev, next -> formatGeneric(node.children) { prev, next ->
if (prev.isTerminal("(")) null else if (next.isTerminal(")")) Line else SpaceOrLine if (prev.isTerminal("(") || next.isTerminal(")")) Line else SpaceOrLine
} }
return Group(newId(), nodes) return Group(newId(), nodes)
} }
@@ -9,3 +9,9 @@ baz =
let (someVariable = 10000000) let (someVariable = 10000000)
let (someOtherVariable = 2000000) let (someOtherVariable = 2000000)
let (someAnotherVariable = 3000000) someVariable + someOtherVariable + someAnotherVariable let (someAnotherVariable = 3000000) someVariable + someOtherVariable + someAnotherVariable
qux = let ( // some comment
// another comment
bar = 5
)
bar
@@ -7,3 +7,12 @@ foo {
bar = 2 bar = 2
} }
} }
bar {
when (new Listing {
1
2
}.contains(1)) {
"1"
}
}
@@ -1,11 +1,13 @@
foo = foo =
let (vaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaariable = let (
vaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaariable =
10 10
) )
1 * 1 1 * 1
bar = bar =
let (someVariable = new Listing { let (
someVariable = new Listing {
1 1
} }
) )
@@ -16,3 +18,10 @@ baz =
let (someOtherVariable = 2000000) let (someOtherVariable = 2000000)
let (someAnotherVariable = 3000000) let (someAnotherVariable = 3000000)
someVariable + someOtherVariable + someAnotherVariable someVariable + someOtherVariable + someAnotherVariable
qux =
let ( // some comment
// another comment
bar = 5
)
bar
@@ -5,3 +5,14 @@ foo {
bar = 2 bar = 2
} }
} }
bar {
when (
new Listing {
1
2
}.contains(1)
) {
"1"
}
}
@@ -864,8 +864,8 @@ public class GenericParser {
ff(children); ff(children);
var paramDef = new ArrayList<Node>(); var paramDef = new ArrayList<Node>();
expect(Token.LPAREN, paramDef, "unexpectedToken", "("); expect(Token.LPAREN, paramDef, "unexpectedToken", "(");
ff(paramDef);
var param = new ArrayList<Node>(); var param = new ArrayList<Node>();
ff(param);
param.add(parseParameter()); param.add(parseParameter());
ff(param); ff(param);
expect(Token.ASSIGN, param, "unexpectedToken", "="); expect(Token.ASSIGN, param, "unexpectedToken", "=");