Jsx ast

compiler/syntax/src/res_comments_table.ml

@@ -1473,27 +1473,27 @@ 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_tag_name = tag; jsx_unary_element_props = props} ->
-    (* handles the comments at the tag *)
+      {jsx_unary_element_tag_name = tag; jsx_unary_element_props = []} ->
     let _, _, trailing = partition_by_loc comments tag.loc in
     let after_expr, _ = partition_adjacent_trailing tag.loc trailing in
-    attach t.trailing tag.loc after_expr;
-    (* handles the comments for the actual props *)
-    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
+    attach t.trailing tag.loc after_expr
+  | Pexp_jsx_unary_element
+      {jsx_unary_element_tag_name = tag; jsx_unary_element_props = props} ->
+    let _leading, inside, trailing = partition_by_loc comments tag.loc in
+    walk_list
+      (props
+      |> List.filter_map (fun prop ->
+             match prop with
+             | Parsetree.JSXPropPunning (_, {loc}) ->
+               Some (ExprArgument {expr; loc})
+             | Parsetree.JSXPropValue ({loc}, _, expr) ->
+               let loc = {loc with loc_end = expr.pexp_loc.loc_end} in
+               Some (ExprArgument {expr; loc})
+             | Parsetree.JSXPropSpreading (loc, expr) ->
+               let loc = {loc with loc_end = expr.pexp_loc.loc_end} in
+               Some (ExprArgument {expr; loc})))
+      t trailing;
+    walk_expression expr t inside
   | Pexp_jsx_container_element
       {
         jsx_container_element_opening_tag_end = opening_greater_than;

compiler/syntax/src/res_printer.ml

@@ -4510,34 +4510,52 @@ and print_jsx_prop ~state prop cmt_tbl =
   let open Parsetree in
   match prop with
   | JSXPropPunning (is_optional, name) ->
-    if is_optional then Doc.concat [Doc.question; Doc.text name.txt]
-    else Doc.text name.txt
+    let prop_has_trailing_comment = has_trailing_comments cmt_tbl name.loc in
+    let doc =
+      if is_optional then Doc.concat [Doc.question; Doc.text name.txt]
+      else Doc.text name.txt
+    in
+    let doc = print_comments doc cmt_tbl name.loc in
+    if prop_has_trailing_comment then
+      Doc.group (Doc.concat [Doc.break_parent; doc])
+    else doc
   | JSXPropValue (name, is_optional, value) ->
+    let value =
+      {
+        value with
+        pexp_loc = {value.pexp_loc with loc_start = name.loc.loc_start};
+      }
+    in
     let value_doc =
-      let v =
-        Doc.concat
-          [
-            (if is_optional then Doc.question else Doc.nil);
-            print_expression_with_comments ~state value cmt_tbl;
-          ]
-      in
+      let v = print_expression ~state value cmt_tbl in
       match Parens.jsx_prop_expr value with
       | Parenthesized | Braced _ ->
         let inner_doc = if Parens.braced_expr value then add_parens v else v in
-        if has_leading_line_comment cmt_tbl value.pexp_loc then
-          add_braces inner_doc
-        else Doc.concat [Doc.lbrace; inner_doc; Doc.rbrace]
+        Doc.concat [Doc.lbrace; inner_doc; Doc.rbrace]
       | _ -> v
     in
-    Doc.concat [Doc.text name.txt; Doc.equal; Doc.group value_doc]
-  | JSXPropSpreading (_, value) ->
-    Doc.concat
-      [
-        Doc.lbrace;
-        Doc.dotdotdot;
-        print_expression_with_comments ~state value cmt_tbl;
-        Doc.rbrace;
-      ]
+    let doc =
+      Doc.concat
+        [
+          Doc.text name.txt;
+          Doc.equal;
+          (if is_optional then Doc.question else Doc.nil);
+          Doc.group value_doc;
+        ]
+    in
+    print_comments doc cmt_tbl value.pexp_loc
+  | JSXPropSpreading (loc, value) ->
+    let value =
+      {value with pexp_loc = {value.pexp_loc with loc_start = loc.loc_start}}
+    in
+    Doc.group
+      (Doc.concat
+         [
+           Doc.lbrace;
+           Doc.dotdotdot;
+           print_expression_with_comments ~state value cmt_tbl;
+           Doc.rbrace;
+         ])
 
 and print_jsx_props ~state props cmt_tbl : Doc.t list =
   props |> List.map (fun prop -> print_jsx_prop ~state prop cmt_tbl)