fix cases for statementDelim

openrewrite · Oct 3, 2024 · 611d18b · 611d18b
1 parent c393fc0
commit 611d18b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...te-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java b/...te-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java
@@ -1812,15 +1812,16 @@ private <J2 extends J> List<JRightPadded<J2>> convertAll(List<? extends Tree> tr
 
  private Space statementDelim(@Nullable Tree t) {
  switch (t.getKind()) {
+ case CONTINUE:
+ case RETURN:
+ case BREAK:
  case ASSERT:
  case ASSIGNMENT:
- case BREAK:
- case CONTINUE:
  case DO_WHILE_LOOP:
  case METHOD_INVOCATION:
  case NEW_CLASS:
- case RETURN:
  case THROW:
+ return sourceBefore(";");
  case EXPRESSION_STATEMENT:
  ExpressionTree expTree = ((ExpressionStatementTree) t).getExpression();
  if (expTree instanceof ErroneousTree) {

diff --git a/...te-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java b/...te-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java
@@ -1810,15 +1810,16 @@ private <J2 extends J> List<JRightPadded<J2>> convertAll(List<? extends Tree> tr
 
  private Space statementDelim(@Nullable Tree t) {
  switch (t.getKind()) {
+ case CONTINUE:
+ case RETURN:
+ case BREAK:
  case ASSERT:
  case ASSIGNMENT:
- case BREAK:
- case CONTINUE:
  case DO_WHILE_LOOP:
  case METHOD_INVOCATION:
  case NEW_CLASS:
- case RETURN:
  case THROW:
+ return sourceBefore(";");
  case EXPRESSION_STATEMENT:
  ExpressionTree expTree = ((ExpressionStatementTree) t).getExpression();
  if (expTree instanceof ErroneousTree) {