Skip to content

Commit 72d4a63

Browse files
committed
test & cleanup
1 parent 59daae1 commit 72d4a63

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,7 +2240,6 @@ private List<Op> visitModifiers(
22402240
builder.open(ZERO);
22412241
boolean first = true;
22422242
boolean lastWasAnnotation = false;
2243-
boolean hasExplicitParameterizedAnnotation = false;
22442243
while (!annotations.isEmpty()) {
22452244
if (nextIsModifier()) {
22462245
break;
@@ -2257,7 +2256,7 @@ private List<Op> visitModifiers(
22572256
}
22582257
builder.close();
22592258

2260-
// pjf specific: enforce breaking operatins for record parameters with annotations with explicit parameters
2259+
// pjf specific: record params should take into consideration the columnLimit
22612260
ImmutableList<Op> trailingBreak = isRecordParameter
22622261
? ImmutableList.of(Break.builder()
22632262
.fillMode(FillMode.UNIFIED)

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/Records.input

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,10 @@ class Records {
2626
this.x = x;
2727
}
2828
}
29+
30+
record R10(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m, int n, int p) {
31+
}
32+
33+
record R10(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l) { }
34+
2935
}

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/Records.output

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,9 @@ class Records {
2626
this.x = x;
2727
}
2828
}
29+
30+
record R10(
31+
int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m, int n, int p) {}
32+
33+
record R10(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l) {}
2934
}

0 commit comments

Comments
 (0)