Fix closing tag indentation

Author: shulhi

compiler/syntax/src/res_comments_table.ml

@@ -1473,24 +1473,21 @@ and walk_expression expr t comments =
     let xs = exprs |> List.map (fun e -> Expression e) in
     walk_list xs t rest
   | Pexp_jsx_unary_element {jsx_unary_element_props = props} ->
-    let _ =
-      List.map
-        (fun prop ->
-          match prop with
-          | Parsetree.JSXPropPunning (_, _) -> ()
-          | Parsetree.JSXPropValue (_, _, expr) ->
-            let _leading, inside, trailing =
-              partition_by_loc comments expr.pexp_loc
-            in
-            let after_expr, _ =
-              partition_adjacent_trailing expr.pexp_loc trailing
-            in
-            attach t.trailing expr.pexp_loc after_expr;
-            walk_expression expr t inside
-          | Parsetree.JSXPropSpreading (_loc, _expr) -> ())
-        props
-    in
-    ()
+    List.iter
+      (fun prop ->
+        match prop with
+        | Parsetree.JSXPropPunning (_, _) -> ()
+        | Parsetree.JSXPropValue (_, _, expr) ->
+          let _leading, inside, trailing =
+            partition_by_loc comments expr.pexp_loc
+          in
+          let after_expr, _ =
+            partition_adjacent_trailing expr.pexp_loc trailing
+          in
+          attach t.trailing expr.pexp_loc after_expr;
+          walk_expression expr t inside
+        | Parsetree.JSXPropSpreading (_loc, _expr) -> ())
+      props
   | Pexp_jsx_container_element
       {
         jsx_container_element_opening_tag_end = opening_greater_than;

compiler/syntax/src/res_printer.ml

@@ -4312,7 +4312,6 @@ and print_pexp_apply ~state expr cmt_tbl =
 and print_jsx_unary_tag ~state tag_name props cmt_tbl =
   let name = print_jsx_name tag_name in
   let formatted_props = print_jsx_props ~state props cmt_tbl in
-  let formatted_props = formatted_props @ [Doc.text "/>"] in
   Doc.group
     (Doc.concat
        [
@@ -4322,6 +4321,8 @@ and print_jsx_unary_tag ~state tag_name props cmt_tbl =
          Doc.indent
            (Doc.concat
               [Doc.line; Doc.group (Doc.join formatted_props ~sep:Doc.line)]);
+         Doc.soft_line;
+         Doc.text "/>";
        ])
 
 and print_jsx_container_tag ~state tag_name props