Add dedicated JavaPrinter#printStatementTerminator() (#4271)

`visitStatement()` now also calls `visitMarkers()` for the markers on the `JRightPadded` object.
openrewrite · Jun 19, 2024 · 954d79b · 954d79b
1 parent 4df7f3a
commit 954d79b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaPrinter.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaPrinter.java
@@ -387,8 +387,11 @@ protected void visitStatement(@Nullable JRightPadded<Statement> paddedStat, JRig
 
         visit(paddedStat.getElement(), p);
         visitSpace(paddedStat.getAfter(), location.getAfterLocation(), p);
+        printStatementTerminator(paddedStat.getElement(), p);
+        visitMarkers(paddedStat.getMarkers(), p);
+    }
 
-        Statement s = paddedStat.getElement();
+    protected void printStatementTerminator(Statement s, PrintOutputCapture<P> p) {
         while (true) {
             if (s instanceof Assert ||
                 s instanceof Assignment ||
@@ -427,9 +430,9 @@ protected void visitStatement(@Nullable JRightPadded<Statement> paddedStat, JRig
                                                 c == Cursor.ROOT_VALUE
                                 )
                                 .getValue();
-                if (aSwitch instanceof J.SwitchExpression) {
+                if (aSwitch instanceof SwitchExpression) {
                     Case aCase = getCursor().getValue();
-                    if (!(aCase.getBody() instanceof J.Block)) {
+                    if (!(aCase.getBody() instanceof Block)) {
                         p.append(';');
                     }
                     return;