make hyphen work in jsx tag names

Author: tsnobip

jscomp/syntax/src/res_core.ml

@@ -2624,6 +2624,8 @@ 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
@@ -2688,6 +2690,8 @@ 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
   Parser.expect LessThan p;
@@ -2699,6 +2703,7 @@ and parseJsx p =
       parseJsxFragment p
     | _ -> parseJsxName p
   in
+  Scanner.popMode p.scanner Jsx;
   Parser.eatBreadcrumb p;
   {jsxExpr with pexp_attributes = [jsxAttr]}
 
@@ -2709,12 +2714,12 @@ and parseJsx p =
  *)
 and parseJsxFragment p =
   let childrenStartPos = p.Parser.startPos in
-  Scanner.setJsxMode p.scanner;
   Parser.expect GreaterThan p;
   let _spread, children = parseJsxChildren p in
   let childrenEndPos = p.Parser.startPos in
   Parser.expect LessThanSlash p;
   Parser.expect GreaterThan p;
+  Scanner.popMode p.scanner Jsx;
   let loc = mkLoc childrenStartPos childrenEndPos in
   makeListExpression loc children None
 
@@ -2769,6 +2774,7 @@ and parseJsxProp p =
     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 =

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

@@ -1,14 +1,4 @@
 
-  Syntax error!
-  tests/parsing/errors/expressions/jsx.res:1:12
-
-  1 │ let x = <di-v />
-  2 │ let x = <Unclosed >;
-  3 │ let x = <Foo.Bar></Free.Will>;
-
-  I'm not sure what to parse here when looking at "-".
-
-
   Syntax error!
   tests/parsing/errors/expressions/jsx.res:2:20
 
@@ -66,7 +56,7 @@
 
   I'm not sure what to parse here when looking at ".".
 
-let x = ((di ~children:[] ())[@JSX ]) - (v / ([%rescript.exprhole ]))
+let x = ((di-v ~children:[] ())[@JSX ])
 let x = ((Unclosed.createElement ~children:[] ())[@JSX ])
 let x =
   ((Foo.Bar.createElement ~children:[] ())[@JSX ]) > ([%rescript.exprhole ])

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

@@ -4,8 +4,7 @@ let x = <Foo.Bar className="container" />
 let x = <Foo.Bar.Baz className="container" />
 let x = <Foo.bar className="container" />
 let x = <Foo.baz className="multiline" />
-let x = <\"custom-tag" className="container" />
-let x = <Foo.\"custom-tag" className="container" />
+let x = <custom-tag className="container" />
 
 // https://github.com/rescript-lang/syntax/issues/570
 let x =
@@ -38,15 +37,10 @@ let x =
     {b}
   </A>
 let x =
-  <\"custom-tag" className="container">
+  <custom-tag className="container">
     {a}
     <B />
-  </\"custom-tag">
-let x =
-  <Foo.\"custom-tag" className="container">
-    {a}
-    <B />
-  </Foo.\"custom-tag">
+  </custom-tag>
 
 let x = <div className="container" className2="container2" className3="container3" onClick />
 

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

@@ -6,17 +6,15 @@ let x = <Foo.bar className="container" />
 let x = <Foo.baz
  className="multiline"
 />
-let x = <\"custom-tag" className="container" />
-let x = <Foo.\"custom-tag" className="container" />
+let x = <custom-tag className="container" />
 
 // https://github.com/rescript-lang/syntax/issues/570
 let x = <A> <B> <C> <D /> <E /> </C> <F> <G /> <H /> </F> </B> </A>
 let x = <A> {children} <B/> </A>
 let x = <A> <B/> {children} </A>
 let x = <A> {a} </A>
 let x = <A> {a} {b} </A>
-let x = <\"custom-tag" className="container" > {a} <B/> </\"custom-tag">
-let x = <Foo.\"custom-tag" className="container" > {a} <B/> </Foo.\"custom-tag">
+let x = <custom-tag className="container" > {a} <B/> </custom-tag>
 
 let x =
   <div