Parse list and list spread in JSX

fixes reasonml#1467
anmonteiro · Aug 9, 2018 · 0217c11 · 0217c11
1 parent 0ab0584
commit 0217c11
Show file tree

Hide file tree

Showing 7 changed files with 4,706 additions and 4,356 deletions.
diff --git a/formatTest/typeCheckedTests/expected_output/jsx.re b/formatTest/typeCheckedTests/expected_output/jsx.re
@@ -553,3 +553,12 @@ let div = (~onClick, ~children, ()) => ();
 <div onClick=onClickHandler>
  <> "foobar" </>
 </div>;
+
+/* https://github.com/facebook/reason/issues/1467 */
+<Foo> 1 2 </Foo>;
+
+<Foo> 1 2 3 4 </Foo>;
+
+<Foo> <> 1 2 3 4 </> </Foo>;
+
+<Foo> <> 1 2 3 </> </Foo>;
diff --git a/formatTest/typeCheckedTests/input/jsx.re b/formatTest/typeCheckedTests/input/jsx.re
@@ -436,3 +436,12 @@ let onClickHandler = () => ();
 let div = (~onClick, ~children, ()) => ();
 
 <div onClick=onClickHandler> <> "foobar" </> </div>;
+
+/* https://github.com/facebook/reason/issues/1467 */
+<Foo> ...[1, 2] </Foo>;
+
+<Foo> [1, 2] [3,4] </Foo>;
+
+<Foo> <> [1, 2] [3,4] </> </Foo>;
+
+<Foo> <> ...[1, 2, 3] </> </Foo>;
diff --git a/formatTest/unit_tests/expected_output/jsx.re b/formatTest/unit_tests/expected_output/jsx.re
@@ -271,6 +271,7 @@ let x = foo /></ bar;
  <> foo bar </>
 </div>;
 
+<<<<<<< HEAD
 /* https://github.com/facebook/reason/issues/2020 */
 <div />;
 
@@ -330,13 +331,15 @@ let x = foo /></ bar;
  )
 />;
 
+switch (foo) {
+| `Variant => <Component />
+};
+
 /* https://github.com/facebook/reason/issues/2028 */
 <Foo bar=M.[] />;
 
 <Foo bar=M.[]> M.[] </Foo>;
 
 <Foo bar=M.[]> ...M.[] </Foo>;
 
-switch (foo) {
-| `Variant => <Component />
-};
+<Foo> 1 2 other </Foo>;
diff --git a/formatTest/unit_tests/input/jsx.re b/formatTest/unit_tests/input/jsx.re
@@ -172,6 +172,7 @@ let x = foo /></ bar;
  <> foo(bar) </>
 </div>;
 
+<<<<<<< HEAD
 /* https://github.com/facebook/reason/issues/2020 */
 <div></div >;
 
@@ -227,13 +228,15 @@ let x = foo /></ bar;
  ))
 />;
 
+switch(foo) {
+| `Variant =><Component />
+};
+
 /* https://github.com/facebook/reason/issues/2028 */
 <Foo bar=M.[]></Foo>;
 
 <Foo bar=M.[]> M.[] </Foo>;
 
 <Foo bar=M.[]> ...M.[] </Foo>;
 
-switch(foo) {
-| `Variant =><Component />
-};
+<Foo> ...[[1,2] , other] </Foo>;