fix misparsing in/after JSX (#6677)

Author: tsnobip

jscomp/syntax/src/res_core.ml

@@ -2612,6 +2612,7 @@ and parseJsxOpeningOrSelfClosingElement ~startPos p =
       let childrenStartPos = p.Parser.startPos in
       Parser.next p;
       let childrenEndPos = p.Parser.startPos in
+      Scanner.popMode p.scanner Jsx;
       Parser.expect GreaterThan p;
       let loc = mkLoc childrenStartPos childrenEndPos in
       makeListExpression loc [] None (* no children *)
@@ -2621,8 +2622,6 @@ and parseJsxOpeningOrSelfClosingElement ~startPos p =
       Parser.next p;
       let spread, children = parseJsxChildren p in
       let childrenEndPos = p.Parser.startPos in
-      Scanner.popMode p.scanner Jsx;
-      Scanner.setJsxMode p.scanner;
       let () =
         match p.token with
         | LessThanSlash -> Parser.next p
@@ -2634,12 +2633,14 @@ and parseJsxOpeningOrSelfClosingElement ~startPos p =
       in
       match p.Parser.token with
       | (Lident _ | Uident _) when verifyJsxOpeningClosingName p name -> (
+        Scanner.popMode p.scanner Jsx;
         Parser.expect GreaterThan p;
         let loc = mkLoc childrenStartPos childrenEndPos in
         match (spread, children) with
         | true, child :: _ -> child
         | _ -> makeListExpression loc children None)
       | token -> (
+        Scanner.popMode p.scanner Jsx;
         let () =
           if Grammar.isStructureItemStart token then
             let closing = "</" ^ string_of_pexp_ident name ^ ">" in
@@ -2660,6 +2661,7 @@ and parseJsxOpeningOrSelfClosingElement ~startPos p =
         | true, child :: _ -> child
         | _ -> makeListExpression loc children None))
     | token ->
+      Scanner.popMode p.scanner Jsx;
       Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
       makeListExpression Location.none [] None
   in
@@ -2687,7 +2689,6 @@ and parseJsxOpeningOrSelfClosingElement ~startPos p =
  *  jsx-children ::= primary-expr*          * => 0 or more
  *)
 and parseJsx p =
-  Scanner.popMode p.scanner Jsx;
   Scanner.setJsxMode p.Parser.scanner;
   Parser.leaveBreadcrumb p Grammar.Jsx;
   let startPos = p.Parser.startPos in
@@ -2700,7 +2701,6 @@ and parseJsx p =
       parseJsxFragment p
     | _ -> parseJsxName p
   in
-  Scanner.popMode p.scanner Jsx;
   Parser.eatBreadcrumb p;
   {jsxExpr with pexp_attributes = [jsxAttr]}
 
@@ -2714,9 +2714,10 @@ and parseJsxFragment p =
   Parser.expect GreaterThan p;
   let _spread, children = parseJsxChildren p in
   let childrenEndPos = p.Parser.startPos in
+  if p.token = LessThan then p.token <- Scanner.reconsiderLessThan p.scanner;
   Parser.expect LessThanSlash p;
-  Parser.expect GreaterThan p;
   Scanner.popMode p.scanner Jsx;
+  Parser.expect GreaterThan p;
   let loc = mkLoc childrenStartPos childrenEndPos in
   makeListExpression loc children None
 
@@ -2756,6 +2757,7 @@ and parseJsxProp p =
         let label =
           if optional then Asttypes.Optional name else Asttypes.Labelled name
         in
+        Scanner.setJsxMode p.scanner;
         Some (label, attrExpr)
       | _ ->
         let attrExpr =
@@ -2767,34 +2769,39 @@ and parseJsxProp p =
         in
         Some (label, attrExpr))
   (* {...props} *)
-  | Lbrace -> (
+  | Lbrace ->
+    Scanner.popMode p.scanner Jsx;
     Parser.next p;
-    match p.Parser.token with
-    | DotDotDot -> (
-      Scanner.popMode p.scanner Jsx;
-      Parser.next p;
-      let loc = mkLoc p.Parser.startPos p.prevEndPos in
-      let propLocAttr =
-        (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr [])
-      in
-      let attrExpr =
-        let e = parsePrimaryExpr ~operand:(parseExpr p) p in
-        {e with pexp_attributes = propLocAttr :: e.pexp_attributes}
-      in
-      (* using label "spreadProps" to distinguish from others *)
-      let label = Asttypes.Labelled "_spreadProps" in
+    let props =
       match p.Parser.token with
-      | Rbrace ->
+      | DotDotDot -> (
         Parser.next p;
-        Some (label, attrExpr)
-      | _ -> None)
-    | _ -> None)
+        let loc = mkLoc p.Parser.startPos p.prevEndPos in
+        let propLocAttr =
+          (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr [])
+        in
+        let attrExpr =
+          let e = parsePrimaryExpr ~operand:(parseExpr p) p in
+          {e with pexp_attributes = propLocAttr :: e.pexp_attributes}
+        in
+        (* using label "spreadProps" to distinguish from others *)
+        let label = Asttypes.Labelled "_spreadProps" in
+        match p.Parser.token with
+        | Rbrace ->
+          Parser.next p;
+          Some (label, attrExpr)
+        | _ -> None)
+      | _ -> None
+    in
+    Scanner.setJsxMode p.scanner;
+    props
   | _ -> None
 
 and parseJsxProps p =
   parseRegion ~grammar:Grammar.JsxAttribute ~f:parseJsxProp p
 
 and parseJsxChildren p =
+  Scanner.popMode p.scanner Jsx;
   let rec loop p children =
     match p.Parser.token with
     | Token.Eof | LessThanSlash -> children
@@ -2815,21 +2822,23 @@ and parseJsxChildren p =
         let () = p.token <- token in
         children
     | token when Grammar.isJsxChildStart token ->
-      let () = Scanner.popMode p.scanner Jsx in
       let child =
         parsePrimaryExpr ~operand:(parseAtomicExpr p) ~noCall:true p
       in
       loop p (child :: children)
     | _ -> children
   in
-  match p.Parser.token with
-  | DotDotDot ->
-    Parser.next p;
-    (true, [parsePrimaryExpr ~operand:(parseAtomicExpr p) ~noCall:true p])
-  | _ ->
-    let children = List.rev (loop p []) in
-    Scanner.popMode p.scanner Jsx;
-    (false, children)
+  let spread, children =
+    match p.Parser.token with
+    | DotDotDot ->
+      Parser.next p;
+      (true, [parsePrimaryExpr ~operand:(parseAtomicExpr p) ~noCall:true p])
+    | _ ->
+      let children = List.rev (loop p []) in
+      (false, children)
+  in
+  Scanner.setJsxMode p.scanner;
+  (spread, children)
 
 and parseBracedOrRecordExpr p =
   let startPos = p.Parser.startPos in

jscomp/syntax/tests/parsing/grammar/expressions/expected/jsx.res.txt

@@ -580,11 +580,13 @@ let _ =
 ;;((div ~children:((span ~children:[] ())[@JSX ]) ())[@JSX ])
 ;;((div ~children:[|a|] ())[@JSX ])
 ;;((div ~children:(1, 2) ())[@JSX ])
+;;((div ~children:((array |. f)[@res.braces ]) ())[@JSX ])
 ;;(([element])[@JSX ])
 ;;(([(((fun a -> 1))[@res.braces ])])[@JSX ])
 ;;(([((span ~children:[] ())[@JSX ])])[@JSX ])
 ;;(([[|a|]])[@JSX ])
 ;;(([(1, 2)])[@JSX ])
+;;(([((array |. f)[@res.braces ])])[@JSX ])
 let _ =
   ((A.createElement ~x:(({js|y|js})[@res.namedArgLoc ]) ~_spreadProps:((str)
       [@res.namedArgLoc ]) ~children:[] ())

jscomp/syntax/tests/parsing/grammar/expressions/jsx.res

@@ -507,11 +507,13 @@ let _ = <View style=styles["backgroundImageWrapper"]>
 <div> ...<span /> </div>
 <div> ...[a] </div>
 <div> ...(1, 2) </div>
+<div> ...{array->f} </div>
 
 <> ...element </>
 <> ...{(a) => 1} </>
 <> ...<span /> </>
 <> ...[a] </>
 <> ...(1, 2) </>
+<> ...{array->f} </>
 
 let _ = <A x="y" {...str} />

jscomp/syntax/tests/printer/expr/expected/jsx.res.txt

@@ -429,3 +429,34 @@ let x = props =>
     {...props}
     className="inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight"
   />
+
+let x = <C> ...{() => msg->React.string} </C>
+
+let x = <C> ...{array->Array.map(React.string)} </C>
+
+let x = <> {array->Array.map(React.string)} </>
+
+let x = {
+  let _ = <div />
+  msg->React.string
+}
+
+let x = {
+  let _ = <div> {children} </div>
+  msg->React.string
+}
+
+let x = {
+  let _ = <> {children} </>
+  msg->React.string
+}
+
+let x = {
+  let _ = <C />
+  msg->React.string
+}
+
+let x = {
+  let _ = <C> {children} </C>
+  msg->React.string
+}

jscomp/syntax/tests/printer/expr/jsx.res

@@ -414,3 +414,34 @@ let x = props =>
     {...props}
     className="inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight"
   />
+
+let x = <C> ...{() => msg->React.string} </C>
+
+let x = <C> ...{array->Array.map(React.string)} </C>
+
+let x = <> ...{array->Array.map(React.string)} </>
+
+let x = {
+  let _ = <div />
+  msg->React.string
+}
+
+let x = {
+  let _ = <div> {children} </div>
+  msg->React.string
+}
+
+let x = {
+  let _ = <> {children} </>
+  msg->React.string
+}
+
+let x = {
+  let _ = <C />
+  msg->React.string
+}
+
+let x = {
+  let _ = <C> {children} </C>
+  msg->React.string
+}