Merge pull request #2 from shulhi/fix-jsx-ast

Fix comments

Author: nojaf

compiler/syntax/src/res_comments_table.ml

@@ -24,25 +24,24 @@ let copy tbl =
 
 let empty = make ()
 
+let print_loc (k : Warnings.loc) =
+  Doc.concat
+    [
+      Doc.lbracket;
+      Doc.text (string_of_int k.loc_start.pos_lnum);
+      Doc.text ":";
+      Doc.text (string_of_int (k.loc_start.pos_cnum - k.loc_start.pos_bol));
+      Doc.text "-";
+      Doc.text (string_of_int k.loc_end.pos_lnum);
+      Doc.text ":";
+      Doc.text (string_of_int (k.loc_end.pos_cnum - k.loc_end.pos_bol));
+      Doc.rbracket;
+    ]
+
 let print_entries tbl =
-  let open Location in
   Hashtbl.fold
     (fun (k : Location.t) (v : Comment.t list) acc ->
-      let loc =
-        Doc.concat
-          [
-            Doc.lbracket;
-            Doc.text (string_of_int k.loc_start.pos_lnum);
-            Doc.text ":";
-            Doc.text
-              (string_of_int (k.loc_start.pos_cnum - k.loc_start.pos_bol));
-            Doc.text "-";
-            Doc.text (string_of_int k.loc_end.pos_lnum);
-            Doc.text ":";
-            Doc.text (string_of_int (k.loc_end.pos_cnum - k.loc_end.pos_bol));
-            Doc.rbracket;
-          ]
-      in
+      let loc = print_loc k in
       let doc =
         Doc.breakable_group ~force_break:true
           (Doc.concat
@@ -1512,7 +1511,8 @@ and walk_expression expr t comments =
     let opening_token = {expr.pexp_loc with loc_end = opening_greater_than} in
     let on_same_line, rest = partition_by_on_same_line opening_token comments in
     attach t.trailing opening_token on_same_line;
-    exprs |> List.iter (fun e -> walk_expression e t rest)
+    let xs = exprs |> List.map (fun e -> Expression e) in
+    walk_list xs t rest
   | Pexp_send _ -> ()
 
 and walk_expr_parameter (_attrs, _argLbl, expr_opt, pattern) t comments =

compiler/syntax/src/res_parens.ml

@@ -384,7 +384,7 @@ let jsx_child_expr expr =
          ( Pexp_ident _ | Pexp_constant _ | Pexp_field _ | Pexp_construct _
          | Pexp_variant _ | Pexp_array _ | Pexp_pack _ | Pexp_record _
          | Pexp_extension _ | Pexp_letmodule _ | Pexp_letexception _
-         | Pexp_open _ | Pexp_sequence _ | Pexp_let _ );
+         | Pexp_open _ | Pexp_sequence _ | Pexp_let _ | Pexp_jsx_fragment _ );
        pexp_attributes = [];
       } ->
         Nothing

compiler/syntax/src/res_parsetree_viewer.ml

@@ -492,6 +492,7 @@ let is_jsx_expression expr =
     | _ :: attrs -> loop attrs
   in
   match expr.pexp_desc with
+  | Pexp_jsx_fragment _ -> true
   | Pexp_apply _ -> loop expr.Parsetree.pexp_attributes
   | _ -> false
 

compiler/syntax/src/res_printer.ml

@@ -3413,6 +3413,7 @@ and print_expression ~state (e : Parsetree.expression) cmt_tbl =
     | Pexp_ifthenelse _ ->
       true
     | Pexp_match _ when ParsetreeViewer.is_if_let_expr e -> true
+    | Pexp_jsx_fragment _ -> true
     | Pexp_construct _ when ParsetreeViewer.has_jsx_attribute e.pexp_attributes
       ->
       true
@@ -4437,17 +4438,32 @@ and print_jsx_fragment ~state (opening_greater_than : Lexing.position)
                   Doc.line;
                   Doc.join ~sep:line_sep
                     (List.map
-                       (fun e ->
-                         let doc =
-                           print_jsx_child ~spread:false ~state e ~cmt_tbl
-                         in
-                         print_comments doc cmt_tbl e.pexp_loc)
+                       (fun e -> print_jsx_child ~state e cmt_tbl)
                        children);
                 ]));
          line_sep;
          closing;
        ])
 
+and print_jsx_child ~state (expr : Parsetree.expression) cmt_tbl =
+  let leading_line_comment_present =
+    has_leading_line_comment cmt_tbl expr.pexp_loc
+  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
+    else Doc.concat [Doc.lbrace; inner_doc; Doc.rbrace]
+  in
+  match Parens.jsx_child_expr expr with
+  | Nothing -> expr_doc
+  | Parenthesized -> add_parens_or_braces expr_doc
+  | Braced braces_loc ->
+    print_comments (add_parens_or_braces expr_doc) cmt_tbl braces_loc
+
 and print_jsx_children ~state (children_expr : Parsetree.expression) ~sep
     cmt_tbl =
   match children_expr.pexp_desc with
@@ -4498,27 +4514,26 @@ and print_jsx_children ~state (children_expr : Parsetree.expression) ~sep
     in
     let docs = loop children_expr [] children in
     Doc.group (Doc.join ~sep docs)
-  | _ -> print_jsx_child ~state children_expr ~cmt_tbl
-
-and print_jsx_child ?(spread = true) ~state
-    (children_expr : Parsetree.expression) ~cmt_tbl =
-  let leading_line_comment_present =
-    has_leading_line_comment cmt_tbl children_expr.pexp_loc
-  in
-  let expr_doc = print_expression_with_comments ~state children_expr cmt_tbl in
-  Doc.concat
-    [
-      (if spread then Doc.dotdotdot else Doc.nil);
-      (match Parens.jsx_child_expr children_expr with
-      | Parenthesized | Braced _ ->
-        let inner_doc =
-          if Parens.braced_expr children_expr then add_parens expr_doc
-          else expr_doc
-        in
-        if leading_line_comment_present then add_braces inner_doc
-        else Doc.concat [Doc.lbrace; inner_doc; Doc.rbrace]
-      | Nothing -> expr_doc);
-    ]
+  | _ ->
+    let leading_line_comment_present =
+      has_leading_line_comment cmt_tbl children_expr.pexp_loc
+    in
+    let expr_doc =
+      print_expression_with_comments ~state children_expr cmt_tbl
+    in
+    Doc.concat
+      [
+        Doc.dotdotdot;
+        (match Parens.jsx_child_expr children_expr with
+        | Parenthesized | Braced _ ->
+          let inner_doc =
+            if Parens.braced_expr children_expr then add_parens expr_doc
+            else expr_doc
+          in
+          if leading_line_comment_present then add_braces inner_doc
+          else Doc.concat [Doc.lbrace; inner_doc; Doc.rbrace]
+        | Nothing -> expr_doc);
+      ]
 
 and print_jsx_props ~state args cmt_tbl : Doc.t * Parsetree.expression option =
   (* This function was introduced because we have different formatting behavior for self-closing tags and other tags

tests/syntax_tests/data/printer/comments/expected/jsx.res.txt

@@ -67,16 +67,8 @@ module Cite = {
 
 let x =
   <>
-    {
-      // before a
-      a // after a
-      // before b
-      // after b
-    }
-    {
-      // before a
-      // after a
-      // before b
-      b // after b
-    }
+    // before a
+    {a} // after a
+    // before b
+    {b} // after b
   </>