allow whitespace before closing > (#2021)

* allow whitespace before closing `>` fixes #2020 * another small enhancement
reasonml · Jun 22, 2018 · bc2240b · bc2240b
1 parent 7089a72
commit bc2240b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/formatTest/unit_tests/expected_output/jsx.re b/formatTest/unit_tests/expected_output/jsx.re
@@ -270,3 +270,10 @@ let x = foo /></ bar;
 <div onClick=this##handleClick>
   <> foo bar </>
 </div>;
+
+/* https://github.com/facebook/reason/issues/2020 */
+<div />;
+
+<div> foo </div>;
+
+<div />;
diff --git a/formatTest/unit_tests/input/jsx.re b/formatTest/unit_tests/input/jsx.re
@@ -171,3 +171,10 @@ let x = foo /></ bar;
 <div onClick=this##handleClick>
   <> foo(bar) </>
 </div>;
+
+/* https://github.com/facebook/reason/issues/2020 */
+<div></div >;
+
+<div>foo</ div>;
+
+<div> </ div >;
diff --git a/src/reason-parser/reason_lexer.mll b/src/reason-parser/reason_lexer.mll
@@ -538,9 +538,9 @@ rule token = parse
     set_lexeme_length lexbuf 1;
     LBRACE
   }
-  | "</" uppercase_or_lowercase (identchar | '.') * ">" {
+  | "</" blank* uppercase_or_lowercase (identchar | '.') * blank* ">" {
     let buf = Lexing.lexeme lexbuf in
-    LESSSLASHIDENTGREATER (String.sub buf 2 (String.length buf - 2 - 1))
+    LESSSLASHIDENTGREATER (String.trim (String.sub buf 2 (String.length buf - 2 - 1)))
   }
   | "]"  { RBRACKET }
   | "{"  { LBRACE }