Handle JSX elements with type arguments

Also, add a unit test for JSX in JavaScript.

Co-Authored-By: Rick Winfrey <[email protected]>

Author: maxbrunsfeld

src/Language/TSX/Assignment.hs

@@ -429,7 +429,7 @@ jsxAttribute' :: Assignment Term
 jsxAttribute' = jsxAttribute <|> jsxExpression'
 
 jsxOpeningElement' :: Assignment Term
-jsxOpeningElement' = makeTerm <$> symbol Grammar.JsxOpeningElement <*> children (TSX.Syntax.JsxOpeningElement <$> term jsxElementName <*> manyTerm jsxAttribute')
+jsxOpeningElement' = makeTerm <$> symbol Grammar.JsxOpeningElement <*> children (TSX.Syntax.JsxOpeningElement <$> term jsxElementName <*> term (typeArguments' <|> emptyTerm) <*> manyTerm jsxAttribute')
 
 jsxElementName :: Assignment Term
 jsxElementName = choice [ identifier, nestedIdentifier, jsxNamespaceName ]

src/Language/TSX/Syntax/JSX.hs

@@ -28,7 +28,7 @@ newtype JsxExpression a = JsxExpression { jsxExpression :: a }
 
 instance Evaluatable JsxExpression
 
-data JsxOpeningElement a = JsxOpeningElement { jsxOpeningElementIdentifier :: !a,  jsxAttributes :: ![a] }
+data JsxOpeningElement a = JsxOpeningElement { jsxOpeningElementIdentifier :: !a, jsxOpeningElementTypeArguments :: a, jsxAttributes :: ![a] }
   deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, NFData1, Ord, Show, ToJSONFields1, Traversable)
   deriving (Eq1, Show1, Ord1) via Generically JsxOpeningElement
 

test/fixtures/javascript/corpus/jsx.A.js

@@ -0,0 +1,5 @@
+function Something() {
+  return <div>
+    <Foo>hello</Foo>
+  </div>;
+}

test/fixtures/javascript/corpus/jsx.B.js

@@ -0,0 +1,5 @@
+function Something() {
+  return <div>
+    <Foo<T>>goodbye</Foo>
+  </div>;
+}

test/fixtures/javascript/corpus/jsx.diffA-B.txt

@@ -0,0 +1,25 @@
+(Statements
+  (Function
+    (Empty)
+    (Empty)
+    (Identifier)
+    (StatementBlock
+      (Return
+        (JsxElement
+          (JsxOpeningElement
+            (Identifier)
+            (Empty))
+          (JsxText)
+          (JsxElement
+            (JsxOpeningElement
+              (Identifier)
+            { (Empty)
+            ->(TypeArguments
+              {+(TypeIdentifier)+}) })
+          { (JsxText)
+          ->(JsxText) }
+            (JsxClosingElement
+              (Identifier)))
+          (JsxText)
+          (JsxClosingElement
+            (Identifier)))))))

test/fixtures/javascript/corpus/jsx.diffB-A.txt

@@ -0,0 +1,25 @@
+(Statements
+  (Function
+    (Empty)
+    (Empty)
+    (Identifier)
+    (StatementBlock
+      (Return
+        (JsxElement
+          (JsxOpeningElement
+            (Identifier)
+            (Empty))
+          (JsxText)
+          (JsxElement
+            (JsxOpeningElement
+              (Identifier)
+            { (TypeArguments
+              {-(TypeIdentifier)-})
+            ->(Empty) })
+          { (JsxText)
+          ->(JsxText) }
+            (JsxClosingElement
+              (Identifier)))
+          (JsxText)
+          (JsxClosingElement
+            (Identifier)))))))

test/fixtures/javascript/corpus/jsx.parseA.txt

@@ -0,0 +1,22 @@
+(Statements
+  (Function
+    (Empty)
+    (Empty)
+    (Identifier)
+    (StatementBlock
+      (Return
+        (JsxElement
+          (JsxOpeningElement
+            (Identifier)
+            (Empty))
+          (JsxText)
+          (JsxElement
+            (JsxOpeningElement
+              (Identifier)
+              (Empty))
+            (JsxText)
+            (JsxClosingElement
+              (Identifier)))
+          (JsxText)
+          (JsxClosingElement
+            (Identifier)))))))

test/fixtures/javascript/corpus/jsx.parseB.txt

@@ -0,0 +1,23 @@
+(Statements
+  (Function
+    (Empty)
+    (Empty)
+    (Identifier)
+    (StatementBlock
+      (Return
+        (JsxElement
+          (JsxOpeningElement
+            (Identifier)
+            (Empty))
+          (JsxText)
+          (JsxElement
+            (JsxOpeningElement
+              (Identifier)
+              (TypeArguments
+                (TypeIdentifier)))
+            (JsxText)
+            (JsxClosingElement
+              (Identifier)))
+          (JsxText)
+          (JsxClosingElement
+            (Identifier)))))))