switch, try, if, while or a loop into the block that follows, which changed it again on every format.Keep line comments in operands followed by a block
🐛 Bug fixprintertests
A line comment inside the operand of switch, try, if, while or a loop was printed as a line suffix in a flat group, so it moved behind the opening brace, and the next format attached it to the block. The operand now breaks the groups around such a comment, and a comment trailing the whole operand goes into parentheses with it, as if conditions already did.
let x = switch [a, b] { // c| _ => 1}
let x = switch [ a, // c b,] {| _ => 1}
🐛 Bug fixFix the formatter moving a line comment in the operand of
Review
- Why not make every same-line line comment break its group? That changes code that formats stably today, such as foo(v :> b) // comment, which would split over three lines; the drift only happens before a block.
- No effect
- Output: unchangedFormats: nonePPX: unchangedEditor: unchanged
- Formatting
- changedoperands of switch, try, if, while and loops that contain a line comment; 80 operand/comment combinations format idempotently (48 did not before), and 330 spread contexts format as before apart from those
- Tests
- syntax
tests/syntax_tests/data/+ printer/comments/operandBeforeBlock.res
- Changelog fragment changes/operand-line-comments.fix.md
- No committed generated JS changes
6 files · +235 −27 · changelog 1 · syntax 3 · tests 2
| A | changes/operand-line-comments.fix.md | +1 | −0 |
| M | compiler/syntax/src/res_doc.ml | +29 | −0 |
| M | compiler/syntax/src/res_doc.mli | +11 | −0 |
| M | compiler/syntax/src/res_printer.ml | +50 | −27 |
| A | tests/syntax_tests/data/printer/comments/expected/operandBeforeBlock.res.txt | +92 | −0 |
| A | tests/syntax_tests/data/printer/comments/operandBeforeBlock.res | +52 | −0 |