Commit 2b70a66
committed
fix: keep leading block comment of clause item on its own line
A block comment placed before the first item of a clause (e.g.
`SELECT /* c */ foo FROM tbl`) was formatted inline on the first pass,
but moved onto its own line when the result was formatted again, making
formatting non-idempotent.
The inline-vs-standalone decision for a block comment was based solely on
its `precedingWhitespace`. The formatter always emits a newline before the
first item of a clause body, so on a second pass that structural newline
becomes the comment's preceding whitespace and flips the decision.
Treat a block comment as standalone whenever it is already at the start of
a line in the output being built, in addition to the existing checks. This
makes the first pass place such comments on their own line directly, so the
output is stable under repeated formatting. Inline block comments that
follow other tokens on the same line (trailing comments, comments between a
function name and its parentheses, or around the `.` of a qualified name)
are unaffected.1 parent a3bfeeb commit 2b70a66
3 files changed
Lines changed: 41 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
378 | 378 | | |
379 | 379 | | |
380 | 380 | | |
381 | | - | |
| 381 | + | |
382 | 382 | | |
383 | 383 | | |
384 | 384 | | |
| |||
388 | 388 | | |
389 | 389 | | |
390 | 390 | | |
391 | | - | |
392 | | - | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
393 | 402 | | |
394 | 403 | | |
395 | 404 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
114 | 130 | | |
115 | 131 | | |
116 | 132 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
64 | 77 | | |
65 | 78 | | |
66 | 79 | | |
| |||
0 commit comments