WIP

Author: shulhi

compiler/syntax/src/res_parens.ml

@@ -353,8 +353,7 @@ let jsx_prop_expr expr =
 
 let jsx_child_expr expr =
   match expr.Parsetree.pexp_desc with
-  | Parsetree.Pexp_let _ | Pexp_sequence _ | Pexp_letexception _
-  | Pexp_letmodule _ | Pexp_open _ ->
+  | Pexp_sequence _ | Pexp_letexception _ | Pexp_letmodule _ | Pexp_open _ ->
     Nothing
   | _ -> (
     let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in

compiler/syntax/src/res_printer.ml

@@ -4583,18 +4583,31 @@ and get_line_sep_for_jsx_children (children : Parsetree.jsx_children) =
 
 and print_jsx_children ~state (children : Parsetree.jsx_children) cmt_tbl =
   let open Parsetree in
+  let get_loc (expr : Parsetree.expression) =
+    let braces =
+      expr.pexp_attributes
+      |> List.find_map (fun (attr, _) ->
+             match attr with
+             | {Location.txt = "res.braces"; loc} -> Some loc
+             | _ -> None)
+    in
+    match braces with
+    | None -> expr.pexp_loc
+    | Some loc -> loc
+  in
   let sep = get_line_sep_for_jsx_children children in
   let print_expr (expr : Parsetree.expression) =
     let leading_line_comment_present =
-      has_leading_line_comment cmt_tbl expr.pexp_loc
+      has_leading_line_comment cmt_tbl (get_loc expr)
     in
     let expr_doc = print_expression_with_comments ~state expr cmt_tbl in
     let add_parens_or_braces expr_doc =
       (* {(20: int)} make sure that we also protect the expression inside *)
       let inner_doc =
         if Parens.braced_expr expr then add_parens expr_doc else expr_doc
       in
-      if leading_line_comment_present then add_braces inner_doc
+      if leading_line_comment_present then
+        print_comments inner_doc cmt_tbl (get_loc expr)
       else Doc.concat [Doc.lbrace; inner_doc; Doc.rbrace]
     in
     match Parens.jsx_child_expr expr with
@@ -4607,19 +4620,6 @@ and print_jsx_children ~state (children : Parsetree.jsx_children) cmt_tbl =
   | JSXChildrenItems [] -> Doc.nil
   | JSXChildrenSpreading child -> Doc.concat [Doc.dotdotdot; print_expr child]
   | JSXChildrenItems children ->
-    let get_loc (expr : Parsetree.expression) =
-      let braces =
-        expr.pexp_attributes
-        |> List.find_map (fun (attr, _) ->
-               match attr with
-               | {Location.txt = "res.braces"; loc} -> Some loc
-               | _ -> None)
-      in
-      match braces with
-      | None -> expr.pexp_loc
-      | Some loc -> loc
-    in
-
     let rec visit acc children =
       match children with
       | [] -> acc