Commit 53ac7d8
committed
Stop splitting long strings inside an escaped backslash
StringWrapper cuts a long string literal before whitespace and before
\t, and ends a piece after \n and \r, but never asked whether the
backslash of such an escape is escaped itself. In 'D:\\tempDb' the
second backslash and the t looked like a tab, so a line break there
left a lone backslash that escaped the closing quote, and the file
failed with "unclosed string literal" (#32, from
palantir#1680). \\n and \\r were misread the same
way: they cut words such as C:\\new in two and forced a line break,
which moved the break but still parsed.
A backslash with an odd number of backslashes right before it now
counts as escaped, both where pieces are cut and where a piece forces
the line to end. Literals without an escaped backslash are cut as
before. Of the JDK 21 and 25 sources, the same 8 files format
differently: resource bundles whose messages contain \\n or \\r, which
no longer break the line after them.1 parent 39f69dc commit 53ac7d8
4 files changed
Lines changed: 95 additions & 3 deletions
File tree
- open-java-format/src
- main/java/com/palantir/javaformat/java
- test
- java/com/palantir/javaformat/java
- resources/com/palantir/javaformat/java/StringWrapperIntegrationTest
Lines changed: 15 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
432 | 432 | | |
433 | 433 | | |
434 | 434 | | |
435 | | - | |
| 435 | + | |
436 | 436 | | |
437 | 437 | | |
438 | 438 | | |
| |||
446 | 446 | | |
447 | 447 | | |
448 | 448 | | |
449 | | - | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
450 | 462 | | |
451 | 463 | | |
452 | 464 | | |
| |||
486 | 498 | | |
487 | 499 | | |
488 | 500 | | |
489 | | - | |
| 501 | + | |
490 | 502 | | |
491 | 503 | | |
492 | 504 | | |
| |||
Lines changed: 69 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
20 | 35 | | |
21 | 36 | | |
22 | 37 | | |
| |||
48 | 63 | | |
49 | 64 | | |
50 | 65 | | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
51 | 120 | | |
52 | 121 | | |
53 | 122 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
0 commit comments