Skip to content

Fixing whitespace attachment for EnumValueSets #6255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fixing whitespace attachment for EnumValueSets #6255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...te-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ public J visitClass(ClassTree node, Space fmt) {
JRightPadded<Statement> enumSet = null;
if (!jcEnums.isEmpty()) {
Tree lastConstant = jcEnums.get(jcEnums.size() - 1);
Space whitespaceBeforeConstants = whitespace();
List<JRightPadded<J.EnumValue>> enumValues = convertAll(jcEnums, commaDelim, t -> {
if (t != lastConstant) {
return whitespace();
Expand Down Expand Up @@ -450,7 +451,7 @@ public J visitClass(ClassTree node, Space fmt) {
enumSet = padRight(
new J.EnumValueSet(
randomId(),
EMPTY,
whitespaceBeforeConstants,
Markers.EMPTY,
enumValues,
skip(";") != null
Expand Down
3 changes: 2 additions & 1 deletion ...te-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ public J visitClass(ClassTree node, Space fmt) {
JRightPadded<Statement> enumSet = null;
if (!jcEnums.isEmpty()) {
Tree lastConstant = jcEnums.get(jcEnums.size() - 1);
Space whitespaceBeforeConstants = whitespace();
List<JRightPadded<J.EnumValue>> enumValues = convertAll(jcEnums, commaDelim, t -> {
if (t != lastConstant) {
return whitespace();
Expand Down Expand Up @@ -540,7 +541,7 @@ public J visitClass(ClassTree node, Space fmt) {
enumSet = padRight(
new J.EnumValueSet(
randomId(),
EMPTY,
whitespaceBeforeConstants,
Markers.EMPTY,
enumValues,
skip(";") != null
Expand Down
3 changes: 2 additions & 1 deletion ...te-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ public J visitClass(ClassTree node, Space fmt) {
JRightPadded<Statement> enumSet = null;
if (!jcEnums.isEmpty()) {
Tree lastConstant = jcEnums.get(jcEnums.size() - 1);
Space whitespaceBeforeConstants = whitespace();
List<JRightPadded<J.EnumValue>> enumValues = convertAll(jcEnums, commaDelim, t -> {
if (t != lastConstant) {
return whitespace();
Expand Down Expand Up @@ -542,7 +543,7 @@ public J visitClass(ClassTree node, Space fmt) {
enumSet = padRight(
new J.EnumValueSet(
randomId(),
EMPTY,
whitespaceBeforeConstants,
Markers.EMPTY,
enumValues,
skip(";") != null
Expand Down
3 changes: 2 additions & 1 deletion ...te-java-25/src/main/java/org/openrewrite/java/isolated/ReloadableJava25ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ public J visitClass(ClassTree node, Space fmt) {
JRightPadded<Statement> enumSet = null;
if (!jcEnums.isEmpty()) {
Tree lastConstant = jcEnums.get(jcEnums.size() - 1);
Space whitespaceBeforeConstants = whitespace();
List<JRightPadded<J.EnumValue>> enumValues = convertAll(jcEnums, commaDelim, t -> {
if (t != lastConstant) {
return whitespace();
Expand Down Expand Up @@ -542,7 +543,7 @@ public J visitClass(ClassTree node, Space fmt) {
enumSet = padRight(
new J.EnumValueSet(
randomId(),
EMPTY,
whitespaceBeforeConstants,
Markers.EMPTY,
enumValues,
skip(";") != null
Expand Down
3 changes: 2 additions & 1 deletion rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ public J visitClass(ClassTree node, Space fmt) {
JRightPadded<Statement> enumSet = null;
if (!jcEnums.isEmpty()) {
Tree lastConstant = jcEnums.get(jcEnums.size() - 1);
Space whitespaceBeforeConstants = whitespace();
List<JRightPadded<J.EnumValue>> enumValues = convertAll(jcEnums, commaDelim, t -> {
if (t != lastConstant) {
return whitespace();
Expand Down Expand Up @@ -449,7 +450,7 @@ public J visitClass(ClassTree node, Space fmt) {
enumSet = padRight(
new J.EnumValueSet(
randomId(),
EMPTY,
whitespaceBeforeConstants,
Markers.EMPTY,
enumValues,
skip(";") != null
Expand Down
16 changes: 16 additions & 0 deletions rewrite-java-tck/src/main/java/org/openrewrite/java/tree/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,20 @@ enum Color {}
)
);
}

@Test
void enumWhitespaceAttachedToEnumValueSet() {
rewriteRun(
java(
"enum Color { RED, GREEN, BLUE }",
spec -> spec.afterRecipe(cu -> {
J.EnumValueSet enumValueSet = (J.EnumValueSet) cu.getClasses().get(0).getBody().getStatements().get(0);
J.EnumValue firstValue = enumValueSet.getEnums().get(0);

assertEquals(" ", enumValueSet.getPrefix().getWhitespace());
assertEquals("", firstValue.getPrefix().getWhitespace());
})
)
);
}
}
Loading