fix empty do-while loop body

openrewrite · Oct 31, 2023 · 9eb1640 · 9eb1640
1 parent 9b5e80c
commit 9eb1640
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java b/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java
@@ -435,14 +435,17 @@ public J visitDoubleColonExpression(KtDoubleColonExpression expression, Executio
 
     @Override
     public J visitDoWhileExpression(KtDoWhileExpression expression, ExecutionContext data) {
+        JRightPadded<Statement> body = null;
+        if (expression.getBody() != null) {
+            body = JRightPadded.build(requireNonNull(expression.getBody()).accept(this, data)
+                    .withPrefix(prefix(expression.getBody().getParent())));
+        }
+
         return new J.DoWhileLoop(
                 randomId(),
                 prefix(expression),
                 Markers.EMPTY,
-                // FIXME NPE if no body
-                JRightPadded.build(requireNonNull(expression.getBody()).accept(this, data)
-                        .withPrefix(prefix(expression.getBody().getParent()))
-                ),
+                body,
                 padLeft(prefix(expression.getWhileKeyword()), mapControlParentheses(requireNonNull(expression.getCondition()), data).withPrefix(prefix(expression.getLeftParenthesis())))
         );
     }

diff --git a/src/test/java/org/openrewrite/kotlin/tree/DoWhileTest.java b/src/test/java/org/openrewrite/kotlin/tree/DoWhileTest.java
@@ -35,4 +35,17 @@ fun test() {
           )
         );
     }
+
+    @Test
+    void emptyBody() {
+        rewriteRun(
+          kotlin(
+            """
+              fun infinite() {
+                  do while (true)
+              }
+              """
+          )
+        );
+    }
 }