Repository navigation
Commit e2c90fd
Run the string wrapping pass to a fixed point
From palantir#1784 by Zayan Khan, which fixes
palantir#1343 (#34 here). The indentation
StringWrapper picks for a text block is derived from the layout around
it, but the same pass can move that layout, so one round is not always
a fixed point. In the nested array initialisers of
palantir#1343 the second text block moved four
columns on a second run, so a file that --replace had just written was
reported by --set-exit-if-changed. wrap already recomputed its
replacements after reformatting, twice; it now repeats the pass while
it keeps changing the source, up to MAX_ROUNDS = 5.
Adapted while bringing it over: paths moved from palantir-java-format/
to open-java-format/, and the changelog entry left out.
Of the 15,747 files of the JDK 21 sources one formats differently,
java/lang/Module.java, whose text block argument the old code moved
again on a second run; one run now gives that second result. Formatting
the sources takes no longer.
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>1 parent 53ac7d8 commit e2c90fd
3 files changed
Lines changed: 73 additions & 0 deletions
File tree
- open-java-format/src
- main/java/com/palantir/javaformat/java
- test/resources/com/palantir/javaformat/java/testdata
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
59 | 67 | | |
60 | 68 | | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
61 | 78 | | |
62 | 79 | | |
63 | 80 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
0 commit comments