Fix bugs (#193)

swc_ecma_parser:
 - fix lexer
 - better error reporting for jsx reference test

swc_ecma_codegen:
 - Update references

ecmascript/codegen/tests/references/028846a58c67687f.js

@@ -1,16 +1,13 @@
 {
     ;
-}
-a();
+}a();
 {
-}
-;
+};
 {
     {
     }
     ;
-}
-;
+};
 b();
 {
 }

ecmascript/codegen/tests/references/29ef8a7a1cbfda7f.js

@@ -1,4 +1,3 @@
 a.in;
 {
-}
-/foo/;
+}/foo/;

ecmascript/codegen/tests/references/4b6559716b2f7b21.js

@@ -1,4 +1,3 @@
 a++;
 {
-}
-/foo/;
+}/foo/;

ecmascript/codegen/tests/references/5d687a45c607ea42.js

@@ -2,7 +2,6 @@
     {
         a;
     }
-}
-{
+}{
     b;
 }

ecmascript/codegen/tests/references/bc89b2b2f1e19f9e.js

@@ -1,3 +1,2 @@
 {
-}
-/foo/;
+}/foo/;

ecmascript/codegen/tests/references/cdca52810bbe4532.js

@@ -3,7 +3,6 @@ function a() {
 }
 a();
 {
-}
-function a() {
+}function a() {
     b.c('e');
 }

ecmascript/codegen/tests/references/dec1ae80150e1664.js

@@ -1,3 +1,2 @@
 {
-}
-/=/;
+}/=/;

ecmascript/codegen/tests/references/f3219596b50bb381.js

@@ -1,4 +1,3 @@
 {
     [1];
-}
-/foo/;
+}/foo/;

ecmascript/parser/src/lexer/state.rs

@@ -99,7 +99,7 @@ impl<'a, I: Input> Lexer<'a, I> {
 impl<'a, I: Input> Iterator for Lexer<'a, I> {
     type Item = TokenAndSpan;
     fn next(&mut self) -> Option<Self::Item> {
-        let start = self.cur_pos();
+        let mut start = self.cur_pos();
 
         let res = (|| -> Result<Option<_>, _> {
             if self.state.is_first {
@@ -119,6 +119,7 @@ impl<'a, I: Input> Iterator for Lexer<'a, I> {
                     }
                     _ => {}
                 }
+                start = self.input.cur_pos();
             };
 
             let c = match self.input.cur() {
@@ -311,7 +312,7 @@ impl State {
 
                     // ${} in template
                     if out == TokenContext::TplQuasi {
-                        return true;
+                        return false;
                     }
 
                     // expression cannot follow expression

ecmascript/parser/src/lexer/tests.rs

@@ -904,6 +904,36 @@ fn empty() {
     assert_eq!(lex_tokens(::Syntax::default(), "",), vec![]);
 }
 
+#[test]
+fn issue_191() {
+    assert_eq!(
+        lex_tokens(
+            ::Syntax::Es(::EsConfig {
+                jsx: true,
+                ..Default::default()
+            }),
+            "`${foo}<bar>`"
+        ),
+        vec![
+            tok!('`'),
+            Token::Template {
+                raw: "".into(),
+                cooked: "".into(),
+                has_escape: false,
+            },
+            tok!("${"),
+            Token::Word(Word::Ident("foo".into())),
+            tok!('}'),
+            Token::Template {
+                raw: "<bar>".into(),
+                cooked: "<bar>".into(),
+                has_escape: false,
+            },
+            tok!('`')
+        ]
+    );
+}
+
 #[bench]
 fn lex_colors_js(b: &mut Bencher) {
     b.bytes = include_str!("../../colors.js").len() as _;

ecmascript/parser/tests/jsx.rs

@@ -153,7 +153,7 @@ fn reference_tests(tests: &mut Vec<TestDescAndFn>) -> Result<(), io::Error> {
 
                 let path = dir.join(&file_name);
                 // Parse source
-                let module = parse_module(cm, handler, &path).expect("should be parsed");
+                let module = parse_module(cm, handler, &path)?;
 
                 if StdErr::from(format!("{:#?}", module))
                     .compare_to_file(format!("{}.stdout", path.display()))

ecmascript/parser/tests/jsx/basic/1/input.js.stdout

@@ -58,5 +58,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/10/input.js.stdout

@@ -104,5 +104,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/11/input.js.stdout

@@ -102,5 +102,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/12/input.js.stdout

@@ -147,5 +147,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/13/input.js.stdout

@@ -255,5 +255,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/14/input.js.stdout

@@ -122,5 +122,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/15/input.js.stdout

@@ -158,5 +158,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/16/input.js.stdout

@@ -101,5 +101,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/17/input.js.stdout

@@ -88,5 +88,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/18/input.js.stdout

@@ -136,5 +136,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/19/input.js.stdout

@@ -212,5 +212,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/2/input.js.stdout

@@ -121,5 +121,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/20/input.js.stdout

@@ -438,5 +438,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/21/input.js.stdout

@@ -194,5 +194,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/3/input.js.stdout

@@ -323,5 +323,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/4/input.js.stdout

@@ -251,5 +251,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/5/input.js.stdout

@@ -58,5 +58,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/6/input.js.stdout

@@ -86,5 +86,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/7/input.js.stdout

@@ -163,5 +163,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/8/input.js.stdout

@@ -209,5 +209,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/asi/input.js.stdout

@@ -159,5 +159,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/custom/tpl-space/input.js

@@ -0,0 +1 @@
+`${foo} <bar>`

ecmascript/parser/tests/jsx/basic/custom/tpl-space/input.js.stdout

@@ -0,0 +1,131 @@
+Module {
+    span: Span {
+        lo: BytePos(
+            0
+        ),
+        hi: BytePos(
+            14
+        ),
+        ctxt: #0
+    },
+    body: [
+        Stmt(
+            Expr(
+                Tpl(
+                    Tpl {
+                        span: Span {
+                            lo: BytePos(
+                                0
+                            ),
+                            hi: BytePos(
+                                14
+                            ),
+                            ctxt: #0
+                        },
+                        exprs: [
+                            Ident(
+                                Ident {
+                                    sym: foo,
+                                    span: Span {
+                                        lo: BytePos(
+                                            3
+                                        ),
+                                        hi: BytePos(
+                                            6
+                                        ),
+                                        ctxt: #0
+                                    },
+                                    type_ann: None,
+                                    optional: false
+                                }
+                            )
+                        ],
+                        quasis: [
+                            TplElement {
+                                span: Span {
+                                    lo: BytePos(
+                                        1
+                                    ),
+                                    hi: BytePos(
+                                        1
+                                    ),
+                                    ctxt: #0
+                                },
+                                tail: false,
+                                cooked: Some(
+                                    Str {
+                                        span: Span {
+                                            lo: BytePos(
+                                                1
+                                            ),
+                                            hi: BytePos(
+                                                1
+                                            ),
+                                            ctxt: #0
+                                        },
+                                        value: Atom('' type=static),
+                                        has_escape: false
+                                    }
+                                ),
+                                raw: Str {
+                                    span: Span {
+                                        lo: BytePos(
+                                            1
+                                        ),
+                                        hi: BytePos(
+                                            1
+                                        ),
+                                        ctxt: #0
+                                    },
+                                    value: Atom('' type=static),
+                                    has_escape: false
+                                }
+                            },
+                            TplElement {
+                                span: Span {
+                                    lo: BytePos(
+                                        7
+                                    ),
+                                    hi: BytePos(
+                                        13
+                                    ),
+                                    ctxt: #0
+                                },
+                                tail: true,
+                                cooked: Some(
+                                    Str {
+                                        span: Span {
+                                            lo: BytePos(
+                                                7
+                                            ),
+                                            hi: BytePos(
+                                                13
+                                            ),
+                                            ctxt: #0
+                                        },
+                                        value: Atom(' <bar>' type=inline),
+                                        has_escape: false
+                                    }
+                                ),
+                                raw: Str {
+                                    span: Span {
+                                        lo: BytePos(
+                                            7
+                                        ),
+                                        hi: BytePos(
+                                            13
+                                        ),
+                                        ctxt: #0
+                                    },
+                                    value: Atom(' <bar>' type=inline),
+                                    has_escape: false
+                                }
+                            }
+                        ]
+                    }
+                )
+            )
+        )
+    ],
+    shebang: None
+}

ecmascript/parser/tests/jsx/basic/custom/tpl/input.js

@@ -0,0 +1 @@
+`${foo}<bar>`

ecmascript/parser/tests/jsx/basic/custom/unary-paren/input.js.stdout

@@ -693,5 +693,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/custom/unary/input.js.stdout

@@ -667,5 +667,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/empty-expression-container/input.js.stdout

@@ -104,5 +104,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/entity/input.js.stdout

@@ -102,5 +102,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/fragment-1/input.js.stdout

@@ -49,5 +49,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/fragment-2/input.js.stdout

@@ -65,5 +65,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/fragment-3/input.js.stdout

@@ -293,5 +293,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/fragment-4/input.js.stdout

@@ -223,5 +223,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/fragment-5/input.js.stdout

@@ -253,5 +253,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/fragment-6/input.js.stdout

@@ -177,5 +177,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/keyword-tag/input.js.stdout

@@ -86,5 +86,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/namespace-tag/input.js.stdout

@@ -183,5 +183,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/nonentity-decimal/input.js.stdout

@@ -102,5 +102,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/nonentity/input.js.stdout

@@ -102,5 +102,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/jsx/basic/yield-tag/input.js.stdout

@@ -155,5 +155,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/annotated/input.ts.stdout

@@ -118,5 +118,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/async-await-null/input.ts.stdout

@@ -102,5 +102,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/async-generic-false-positive/input.ts.stdout

@@ -170,5 +170,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/async-generic/input.ts.stdout

@@ -191,5 +191,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/async-rest-optional-parameter/input.ts.stdout

@@ -141,5 +141,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/async-rest/input.ts.stdout

@@ -141,5 +141,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/async/input.ts.stdout

@@ -118,5 +118,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/default-parameter-values/input.ts.stdout

@@ -122,5 +122,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/destructuring/input.ts.stdout

@@ -111,5 +111,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.stdout

@@ -191,5 +191,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/generic/input.ts.stdout

@@ -191,5 +191,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/optional-parameter/input.ts.stdout

@@ -118,5 +118,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/arrow-function/predicate-types/input.ts.stdout

@@ -158,5 +158,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/as/input.ts.stdout

@@ -316,5 +316,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/assert-and-assign/input.ts.stdout

@@ -90,5 +90,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/false-positive/input.ts.stdout

@@ -128,5 +128,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/multiple-assert-and-assign/input.ts.stdout

@@ -117,5 +117,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/need-parentheses/input.ts.stdout

@@ -290,5 +290,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/null-assertion-2/input.ts.stdout

@@ -72,5 +72,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/null-assertion-3/input.ts.stdout

@@ -106,5 +106,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/null-assertion-and-assign-2/input.ts.stdout

@@ -74,5 +74,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/null-assertion-and-assign/input.ts.stdout

@@ -74,5 +74,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/null-assertion-false-positive/input.ts.stdout

@@ -63,5 +63,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/null-assertion-then-property-access/input.ts.stdout

@@ -74,5 +74,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/null-assertion/input.ts.stdout

@@ -42,5 +42,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/type-assertion-after-operator/input.ts.stdout

@@ -86,5 +86,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/type-assertion-and-assign/input.ts.stdout

@@ -101,5 +101,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/type-assertion-before-operator/input.ts.stdout

@@ -86,5 +86,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/cast/type-assertion/input.ts.stdout

@@ -56,5 +56,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/abstract-false-positive/input.ts.stdout

@@ -29,5 +29,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/abstract/input.ts.stdout

@@ -201,5 +201,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.stdout

@@ -269,5 +269,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/constructor/input.ts.stdout

@@ -430,5 +430,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/declare/input.ts.stdout

@@ -370,5 +370,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/expression-extends-implements/input.ts.stdout

@@ -442,5 +442,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/expression-extends/input.ts.stdout

@@ -260,5 +260,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/expression-generic/input.ts.stdout

@@ -186,5 +186,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/expression-implements/input.ts.stdout

@@ -286,5 +286,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/extends-implements/input.ts.stdout

@@ -219,5 +219,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/extends/input.ts.stdout

@@ -128,5 +128,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/generic/input.ts.stdout

@@ -184,5 +184,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/get-generic/input.ts.stdout

@@ -170,5 +170,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/implements/input.ts.stdout

@@ -141,5 +141,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/index-signature/input.ts.stdout

@@ -221,5 +221,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.stdout

@@ -384,5 +384,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.stdout

@@ -131,5 +131,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/method-computed/input.ts.stdout

@@ -275,5 +275,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/method-generic/input.ts.stdout

@@ -583,5 +583,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/method-no-body/input.ts.stdout

@@ -181,5 +181,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }

ecmascript/parser/tests/typescript/class/method-optional/input.ts.stdout

@@ -142,5 +142,6 @@ Module {
                 )
             )
         )
-    ]
+    ],
+    shebang: None
 }