Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/prettier-plugin-java/src/printers/classes.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const _ = require("lodash");
const { line, softline, hardline } = require("prettier").doc.builders;
const {
getBlankLinesSeparator,
hasLeadingLineComments,
reject,
rejectAndConcat,
Expand Down Expand Up @@ -685,8 +686,10 @@ class ClassesPrettierVisitor {

enumConstantList(ctx) {
const enumConstants = this.mapVisit(ctx.enumConstant);

const blankLineSeparators = getBlankLinesSeparator(ctx.enumConstant);
const commas = ctx.Comma
? ctx.Comma.map(elt => concat([elt, hardline]))
? ctx.Comma.map((elt, index) => concat([elt, blankLineSeparators[index]]))
: [];

return group(rejectAndJoinSeps(commas, enumConstants));
Expand Down
18 changes: 18 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/enum/_input.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,21 @@ public static enum VALID_THINGS {
}

}

public enum OtherEnum {
ONE, TWO,

THREE,



FOUR,
/* Five */
FIVE,

/* Six */
SIX


}

14 changes: 14 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/enum/_output.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,17 @@ public static enum VALID_THINGS {
SECOND
}
}

public enum OtherEnum {
ONE,
TWO,

THREE,

FOUR,
/* Five */
FIVE,

/* Six */
SIX
}