Fix issue of whitespace lost on empty while-loop body before trailing…

… semi-colon (#583)
openrewrite · Jan 9, 2024 · 666bc77 · 666bc77
1 parent 10052ef
commit 666bc77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java b/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java
@@ -1623,7 +1623,8 @@ public J visitWhileExpression(KtWhileExpression expression, ExecutionContext dat
                 deepPrefix(expression),
                 Markers.EMPTY,
                 mapControlParentheses(requireNonNull(expression.getCondition()), data).withPrefix(prefix(expression.getLeftParenthesis())),
-                expression.getBody() == null ? JRightPadded.build(new J.Empty(randomId(), Space.EMPTY, Markers.EMPTY)) : JRightPadded.build(requireNonNull(expression.getBody()).accept(this, data).withPrefix(prefix(expression.getBody().getParent())))
+                expression.getBody() == null ? JRightPadded.build(new J.Empty(randomId(), suffix(expression.getRightParenthesis()), Markers.EMPTY)) :
+                        JRightPadded.build(requireNonNull(expression.getBody()).accept(this, data).withPrefix(prefix(expression.getBody().getParent())))
         );
     }
 

diff --git a/src/test/java/org/openrewrite/kotlin/tree/WhileLoopTest.java b/src/test/java/org/openrewrite/kotlin/tree/WhileLoopTest.java
@@ -82,7 +82,7 @@ void noBody() {
           kotlin(
             """
               fun test ( ) {
-                  while ( true );
+                  while ( true )   ;
               }
               """
           )