Improve recovery of incomplete jsx tags.

Port frontend completion.

Author: nojaf

analysis/src/CompletionFrontEnd.ml

@@ -1325,10 +1325,27 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
                         inJsx = !inJsxContext;
                       }))
             | None -> ())
-        | Pexp_apply {funct = {pexp_desc = Pexp_ident compName}; args}
-          when Res_parsetree_viewer.is_jsx_expression expr ->
+        | Pexp_jsx_unary_element
+            {
+              jsx_unary_element_tag_name = compName;
+              jsx_unary_element_props = props;
+            }
+        | Pexp_jsx_container_element
+            {
+              jsx_container_element_tag_name_start = compName;
+              jsx_container_element_props = props;
+            } ->
           inJsxContext := true;
-          let jsxProps = CompletionJsx.extractJsxProps ~compName ~args in
+          let children =
+            match expr.pexp_desc with
+            | Pexp_jsx_container_element
+                {jsx_container_element_children = children} ->
+              children
+            | _ -> JSXChildrenItems []
+          in
+          let jsxProps =
+            CompletionJsx.extractJsxProps ~compName ~props ~children
+          in
           let compNamePath = flattenLidCheckDot ~jsx:true compName in
           if debug then
             Printf.printf "JSX <%s:%s %s> _children:%s\n"

analysis/src/CompletionJsx.ml

@@ -455,40 +455,39 @@ let findJsxPropsCompletable ~jsxProps ~endPos ~posBeforeCursor
   in
   loop jsxProps.props
 
-let extractJsxProps ~(compName : Longident.t Location.loc) ~args =
-  let thisCaseShouldNotHappen =
-    {
-      compName = Location.mknoloc (Longident.Lident "");
-      props = [];
-      childrenStart = None;
-    }
+let extractJsxProps ~(compName : Longident.t Location.loc) ~props ~children =
+  let open Parsetree in
+  let childrenStart =
+    match children with
+    | JSXChildrenItems [] -> None
+    | JSXChildrenSpreading child | JSXChildrenItems (child :: _) ->
+      if child.pexp_loc.loc_ghost then None else Some (Loc.start child.pexp_loc)
   in
-  let rec processProps ~acc args =
-    match args with
-    | (Asttypes.Labelled {txt = "children"}, {Parsetree.pexp_loc}) :: _ ->
-      {
-        compName;
-        props = List.rev acc;
-        childrenStart =
-          (if pexp_loc.loc_ghost then None else Some (Loc.start pexp_loc));
-      }
-    | ( (Labelled {txt = s; loc} | Optional {txt = s; loc}),
-        (eProp : Parsetree.expression) )
-      :: rest -> (
-      let namedArgLoc = if loc = Location.none then None else Some loc in
-      match namedArgLoc with
-      | Some loc ->
-        processProps
-          ~acc:
-            ({
-               name = s;
-               posStart = Loc.start loc;
-               posEnd = Loc.end_ loc;
-               exp = eProp;
-             }
-            :: acc)
-          rest
-      | None -> processProps ~acc rest)
-    | _ -> thisCaseShouldNotHappen
+  let props =
+    props
+    |> List.map (function
+         | JSXPropPunning (_, name) ->
+           {
+             name = name.txt;
+             posStart = Loc.start name.loc;
+             posEnd = Loc.end_ name.loc;
+             exp =
+               Ast_helper.Exp.ident
+                 {txt = Longident.Lident name.txt; loc = name.loc};
+           }
+         | JSXPropValue (name, _, value) ->
+           {
+             name = name.txt;
+             posStart = Loc.start name.loc;
+             posEnd = Loc.end_ name.loc;
+             exp = value;
+           }
+         | JSXPropSpreading (loc, expr) ->
+           {
+             name = "_spreadProps";
+             posStart = Loc.start loc;
+             posEnd = Loc.end_ loc;
+             exp = expr;
+           })
   in
-  args |> processProps ~acc:[]
+  {compName; props; childrenStart}

analysis/src/Utils.ml

@@ -112,6 +112,8 @@ let identifyPexp pexp =
   | Pexp_extension _ -> "Pexp_extension"
   | Pexp_open _ -> "Pexp_open"
   | Pexp_jsx_fragment _ -> "Pexp_jsx_fragment"
+  | Pexp_jsx_unary_element _ -> "Pexp_jsx_unary_element"
+  | Pexp_jsx_container_element _ -> "Pexp_jsx_container_element"
 
 let identifyPpat pat =
   match pat with

compiler/syntax/src/res_core.ml

@@ -145,7 +145,6 @@ module InExternal = struct
   let status = ref false
 end
 
-(* let jsx_attr = (Location.mknoloc "JSX", Parsetree.PStr []) *)
 let ternary_attr = (Location.mknoloc "res.ternary", Parsetree.PStr [])
 let if_let_attr = (Location.mknoloc "res.iflet", Parsetree.PStr [])
 let make_await_attr loc = (Location.mkloc "res.await" loc, Parsetree.PStr [])
@@ -2598,11 +2597,7 @@ and parse_jsx_opening_or_self_closing_element ~start_pos p :
     Parser.expect GreaterThan p;
     let loc = mk_loc jsx_start_pos p.Parser.start_pos in
     (* Ast_helper.Exp.make_list_expression loc [] None no children *)
-    let desc =
-      Parsetree.Pexp_jsx_unary_element
-        {jsx_unary_element_tag_name = name; jsx_unary_element_props = jsx_props}
-    in
-    {pexp_desc = desc; pexp_loc = loc; pexp_attributes = []}
+    Ast_helper.Exp.jsx_unary_element ~loc name jsx_props
   | GreaterThan -> (
     (* <foo a=b> bar </foo> *)
     (* let children_start_pos = p.Parser.start_pos in *)
@@ -2623,15 +2618,7 @@ and parse_jsx_opening_or_self_closing_element ~start_pos p :
       Scanner.pop_mode p.scanner Jsx;
       Parser.expect GreaterThan p;
       let loc = mk_loc jsx_start_pos p.Parser.start_pos in
-      let desc =
-        Parsetree.Pexp_jsx_container_element
-          {
-            jsx_container_element_tag_name_start = name;
-            jsx_container_element_props = jsx_props;
-            jsx_container_element_children = children;
-          }
-      in
-      {pexp_desc = desc; pexp_loc = loc; pexp_attributes = []}
+      Ast_helper.Exp.jsx_container_element ~loc name jsx_props children
       (* let loc = mk_loc children_start_pos children_end_pos in
       match (spread, children) with
       | true, child :: _ -> child
@@ -2653,12 +2640,17 @@ and parse_jsx_opening_or_self_closing_element ~start_pos p :
             (Diagnostics.message msg);
           Parser.expect GreaterThan p
       in
-      Ast_helper.Exp.make_list_expression (mk_loc p.start_pos p.end_pos) [] None
+      Ast_helper.Exp.jsx_container_element
+        ~loc:(mk_loc jsx_start_pos p.end_pos)
+        name jsx_props children
+    (* Ast_helper.Exp.make_list_expression (mk_loc p.start_pos p.end_pos) [] None *)
     )
   | token ->
     Scanner.pop_mode p.scanner Jsx;
     Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-    Ast_helper.Exp.make_list_expression Location.none [] None
+    Ast_helper.Exp.jsx_unary_element
+      ~loc:(mk_loc jsx_start_pos p.end_pos)
+      name jsx_props
 
 (* and parse_jsx_opening_or_self_closing_element_old ~start_pos p =
   let jsx_start_pos = p.Parser.start_pos in

compiler/syntax/src/res_parsetree_viewer.ml

@@ -485,26 +485,12 @@ let filter_fragile_match_attributes attrs =
     attrs
 
 let is_jsx_expression expr =
-  let rec loop attrs =
-    match attrs with
-    | [] -> false
-    | ({Location.txt = "JSX"}, _) :: _ -> true
-    | _ :: attrs -> loop attrs
-  in
   match expr.pexp_desc with
-  | Pexp_jsx_fragment _ -> true
-  | Pexp_apply _ -> loop expr.Parsetree.pexp_attributes
+  | Pexp_jsx_fragment _ | Pexp_jsx_unary_element _
+  | Pexp_jsx_container_element _ ->
+    true
   | _ -> false
 
-let has_jsx_attribute attributes =
-  let rec loop attrs =
-    match attrs with
-    | [] -> false
-    | ({Location.txt = "JSX"}, _) :: _ -> true
-    | _ :: attrs -> loop attrs
-  in
-  loop attributes
-
 let should_indent_binary_expr expr =
   let same_precedence_sub_expression operator sub_expression =
     match sub_expression with

compiler/syntax/src/res_parsetree_viewer.mli

@@ -88,7 +88,6 @@ val filter_fragile_match_attributes :
   Parsetree.attributes -> Parsetree.attributes
 
 val is_jsx_expression : Parsetree.expression -> bool
-val has_jsx_attribute : Parsetree.attributes -> bool
 
 val should_indent_binary_expr : Parsetree.expression -> bool
 val should_inline_rhs_binary_expr : Parsetree.expression -> bool

compiler/syntax/src/res_printer.ml

@@ -3420,9 +3420,8 @@ 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
-      ->
+    | Pexp_jsx_fragment _ | Pexp_jsx_unary_element _
+    | Pexp_jsx_container_element _ ->
       true
     | _ -> false
   in