Skip to content

Commit 93fd3b5

Browse files
marcusrobertsMarcus Roberts
andauthored
fix(grainfmt): Properly handle if/then/else line breaks (#1217)
Fix a formatter error Co-authored-by: Marcus Roberts <marcus@marcusr.com>
1 parent 4b14bd7 commit 93fd3b5

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

compiler/grainformat/format.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2735,7 +2735,7 @@ and print_expression =
27352735
])
27362736
| _ =>
27372737
Doc.concat([
2738-
Doc.line,
2738+
if (true_is_block) {Doc.space} else {Doc.line},
27392739
Doc.text("else"),
27402740
if (true_is_block) {
27412741
false_made_block := true;

compiler/test/formatter_inputs/ifthenelse.gr

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ if (true) { "a reallly long string long long long lfd dsds dsds dsds"} else if (
33
if (SomeModule.ne(mval, 10)) (if (SomeModule.ltS(yval, 11)) SomeModule.sub(12, mres) else mres) else 14
44

55
if (SomeModule.ne(mval, 10000)) (if (SomeModule.ltS(yval, 111111)) SomeModule.sub(1323232, mres) else mres) else 1232324
6+
7+
if (1 ==2) {
8+
print("false")
9+
} else print("true")

compiler/test/formatter_outputs/ifthenelse.gr

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,9 @@ if (SomeModule.ne(mval, 10)) (
1313
if (SomeModule.ne(mval, 10000)) (
1414
if (SomeModule.ltS(yval, 111111)) SomeModule.sub(1323232, mres) else mres
1515
) else 1232324
16+
17+
if (1 == 2) {
18+
print("false")
19+
} else {
20+
print("true")
21+
}

0 commit comments

Comments
 (0)