Repository navigation
Commit 018c370
committed
Leave imports that cannot be sorted alone instead of failing the file
ImportOrderer.reorderImports threw "Imports not contiguous (perhaps a
comment separates them?)" when another import followed the imports it
had scanned. Since #39 a comment between imports goes with the import
after it, so the only input left that reaches this check is a stray `;`
between two imports, which javac warns about up to --release 17 and
rejects from 21 on. The formatter's own parser rejects it too, so such a
file still fails, but formatSourceAndFixImports, which fixes the imports
before it formats, reported the misleading message instead of the parse
error.
The orderer now returns the text unchanged there, as
google/google-java-format#1528 does, and formatSourceAndFixImports
reports "2:1: error: extraneous semicolon". The command line formats
before it fixes the imports and reported the parse error already.1 parent 9b11043 commit 018c370
3 files changed
Lines changed: 34 additions & 2 deletions
File tree
- open-java-format/src
- main/java/com/palantir/javaformat/java
- test/java/com/palantir/javaformat/java
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
80 | 83 | | |
81 | 84 | | |
82 | | - | |
| 85 | + | |
83 | 86 | | |
84 | 87 | | |
85 | 88 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
236 | 236 | | |
237 | 237 | | |
238 | 238 | | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
239 | 258 | | |
240 | 259 | | |
241 | 260 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
411 | 411 | | |
412 | 412 | | |
413 | 413 | | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
414 | 424 | | |
415 | 425 | | |
416 | 426 | | |
| |||
0 commit comments