handle when the else block is what's reported

Author: nahsra

core-codemods/src/main/java/io/codemodder/codemods/AddClarifyingBracesCodemod.java

@@ -38,21 +38,25 @@ public boolean onResultFound(
       final Node node,
       final Result result) {
 
+    // handle the while case
     if (node instanceof WhileStmt) {
-      return handleUnbracedStmt(context, cu, new UnbracedWhileStatement((WhileStmt) node), result);
-    } else if (node.getParentNode().isPresent() && node.getParentNode().get() instanceof IfStmt) {
-      return handleUnbracedStmt(
-          context, cu, new UnbracedIfStatement((IfStmt) node.getParentNode().get()), result);
+      return handleUnbracedStmt(new UnbracedWhileStatement((WhileStmt) node));
+
+      // handle the if case
+    } else if (node.getParentNode().isPresent()
+        && node.getParentNode().get() instanceof IfStmt ifStmt) {
+      if (ifStmt.getThenStmt() == node) {
+        return handleUnbracedStmt(new UnbracedIfStatement(ifStmt));
+        // handle the else case
+      } else if (ifStmt.getElseStmt().isPresent() && ifStmt.getElseStmt().get() == node) {
+        return handleUnbracedStmt(new UnbracedElseStatement(ifStmt));
+      }
     }
     return false;
   }
 
-  /** Handles the case where the {@link Node} is a while statement. */
-  private boolean handleUnbracedStmt(
-      final CodemodInvocationContext context,
-      final CompilationUnit cu,
-      final UnbracedStatement stmt,
-      final Result result) {
+  /** Handles the case where the {@link Node} is a while unbracedStatement. */
+  private boolean handleUnbracedStmt(final UnbracedStatement stmt) {
     Node parentNode = stmt.getParentNode();
     List<Node> childNodes = parentNode.getChildNodes();
     int index = childNodes.indexOf(stmt.getStatement());
@@ -139,4 +143,30 @@ public Statement getStatement() {
       return ifStmt;
     }
   }
+
+  private record UnbracedElseStatement(IfStmt ifStmt) implements UnbracedStatement {
+    private UnbracedElseStatement {
+      Objects.requireNonNull(ifStmt);
+    }
+
+    @Override
+    public Node getParentNode() {
+      return ifStmt.getParentNode().get();
+    }
+
+    @Override
+    public Range getExistingSingleStatementRange() {
+      return ifStmt.getElseStmt().get().getRange().get();
+    }
+
+    @Override
+    public void addBraces() {
+      ifStmt.setElseStmt(new BlockStmt(NodeList.nodeList(ifStmt.getElseStmt().get())));
+    }
+
+    @Override
+    public Statement getStatement() {
+      return ifStmt;
+    }
+  }
 }

core-codemods/src/test/resources/add-clarifying-braces/Test.java.after

@@ -27,4 +27,22 @@ public class Test
         doNonAdminStuff5();
    }
 
+   void handleEndingDoesntNeedAdjustment() {
+     if(!isAdmin)
+     doNonAdminStuff5();
+   }
+
+   void handleElse() {
+     System.out.println("a");
+     if(isAdmin) {
+       System.out.println("b");
+     }
+     else
+       {
+           System.out.println("c");
+       }
+       System.out.println("d");
+
+     System.out.println("e");
+   }
 }

core-codemods/src/test/resources/add-clarifying-braces/Test.java.before

@@ -23,4 +23,20 @@ public class Test
         doNonAdminStuff5();
    }
 
+   void handleEndingDoesntNeedAdjustment() {
+     if(!isAdmin)
+     doNonAdminStuff5();
+   }
+
+   void handleElse() {
+     System.out.println("a");
+     if(isAdmin) {
+       System.out.println("b");
+     }
+     else
+       System.out.println("c");
+       System.out.println("d");
+
+     System.out.println("e");
+   }
 }