Override printStatementTerminator() in GroovyPrinter

knutwannheden · knutwannheden · commit cfd15b6bf95d · 2024-06-19T13:54:27.000+02:00
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyPrinter.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyPrinter.java
@@ -397,12 +397,9 @@ public J visitReturn(J.Return return_, PrintOutputCapture<P> p) {
             return super.visitReturn(return_, p);
         }
 
-        protected void visitStatement(@Nullable JRightPadded<Statement> paddedStat, JRightPadded.Location location, PrintOutputCapture<P> p) {
-            if (paddedStat != null) {
-                visit(paddedStat.getElement(), p);
-                visitSpace(paddedStat.getAfter(), location.getAfterLocation(), p);
-                visitMarkers(paddedStat.getMarkers(), p);
-            }
+        @Override
+        protected void printStatementTerminator(Statement s, PrintOutputCapture<P> p) {
+            // empty
         }
 
         @Override
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,8 @@ 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);
+        printStatementTerminator(paddedStat.getElement(), p);
     }
 
     protected void printStatementTerminator(Statement s, PrintOutputCapture<P> p) {

Original file line number	Diff line number	Diff line change
`@@ -397,12 +397,9 @@ public J visitReturn(J.Return return_, PrintOutputCapture<P> p) {`
`397`	`397`	`return super.visitReturn(return_, p);`
`398`	`398`	`}`
`399`	`399`
`400`		`- protected void visitStatement(@Nullable JRightPadded<Statement> paddedStat, JRightPadded.Location location, PrintOutputCapture<P> p) {`
`401`		`- if (paddedStat != null) {`
`402`		`- visit(paddedStat.getElement(), p);`
`403`		`- visitSpace(paddedStat.getAfter(), location.getAfterLocation(), p);`
`404`		`- visitMarkers(paddedStat.getMarkers(), p);`
`405`		`- }`
	`400`	`+ @Override`
	`401`	`+ protected void printStatementTerminator(Statement s, PrintOutputCapture<P> p) {`
	`402`	`+ // empty`
`406`	`403`	`}`
`407`	`404`
`408`	`405`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -387,8 +387,8 @@ protected void visitStatement(@Nullable JRightPadded<Statement> paddedStat, JRig`
`387`	`387`
`388`	`388`	`visit(paddedStat.getElement(), p);`
`389`	`389`	`visitSpace(paddedStat.getAfter(), location.getAfterLocation(), p);`
`390`		`- printStatementTerminator(paddedStat.getElement(), p);`
`391`	`390`	`visitMarkers(paddedStat.getMarkers(), p);`
	`391`	`+ printStatementTerminator(paddedStat.getElement(), p);`
`392`	`392`	`}`
`393`	`393`
`394`	`394`	`protected void printStatementTerminator(Statement s, PrintOutputCapture<P> p) {`