unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-21 07:17:25 +03:00
Code Issues Projects Releases Wiki Activity

Fix printing of ifs with multiline conditions

Browse Source 
Pretty-printing ifs with multiline conditions previously would not break
the line before the then, leading to roundtripping errors. For example:
```
if
  a = b
  a
then foo
else bar
```
would print as:
```
if
  a = b
  a then foo else bar
```

This fixes the term printer to add a new case for when the condition is
multiline.
This commit is contained in:
Nicole Prindle 2022-01-20 17:57:15 -05:00
parent 3336bbbb43
commit ca6dd75a66
No known key found for this signature in database
GPG Key ID: 56E908E54EC7B88E
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
parser-typechecker/src/Unison/TermPrinter.hs
View File

@ -263,14 +263,20 @@ pretty0
<> optSpace <> (fmt S.DelimiterChar $ l "]")
where optSpace = PP.orElse "" " "
If' cond t f -> paren (p >= 2) $
if PP.isMultiLine pt || PP.isMultiLine pf then PP.lines [
(fmt S.ControlKeyword "if ") <> pcond <> (fmt S.ControlKeyword " then") `PP.hang` pt,
(fmt S.ControlKeyword "else") `PP.hang` pf
]
else PP.spaced [
((fmt S.ControlKeyword "if") `PP.hang` pcond) <> ((fmt S.ControlKeyword " then") `PP.hang` pt),
if PP.isMultiLine pcond then PP.lines [
(fmt S.ControlKeyword "if") `PP.hang` pcond,
(fmt S.ControlKeyword "then") `PP.hang` pt,
(fmt S.ControlKeyword "else") `PP.hang` pf
]
else
if PP.isMultiLine pt || PP.isMultiLine pf then PP.lines [
(fmt S.ControlKeyword "if ") <> pcond <> (fmt S.ControlKeyword " then") `PP.hang` pt,
(fmt S.ControlKeyword "else") `PP.hang` pf
]
else PP.spaced [
((fmt S.ControlKeyword "if") `PP.hang` pcond) <> ((fmt S.ControlKeyword " then") `PP.hang` pt),
(fmt S.ControlKeyword "else") `PP.hang` pf
]
where
pcond = pretty0 n (ac 2 Block im doc) cond
pt = branch t