fix: more

swc-project · Nov 2, 2022 · 6b0cf14 · 6b0cf14
1 parent 8f0334c
commit 6b0cf14
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/crates/swc_ecma_parser/src/parser/expr/ops.rs b/crates/swc_ecma_parser/src/parser/expr/ops.rs
@@ -331,10 +331,6 @@ impl<I: Tokens> Parser<I> {
         }
 
         if is!(self, "await") {
-            let ctx = self.ctx();
-            if ctx.in_function && !ctx.in_async {
-                self.emit_err(self.input.cur_span(), SyntaxError::AwaitInFunction);
-            }
             return self.parse_await_expr();
         }
 
@@ -379,14 +375,18 @@ impl<I: Tokens> Parser<I> {
 
         let span = span!(self, start);
 
-        if is_one_of!(self, ')', ']', ';', ',') && !self.ctx().in_async {
-            if ctx.in_async || ctx.module {
+        if is_one_of!(self, ')', ']', ';', ',') && !ctx.in_async {
+            if ctx.module {
                 self.emit_err(span, SyntaxError::InvalidIdentInAsync);
             }
 
             return Ok(Box::new(Expr::Ident(Ident::new(js_word!("await"), span))));
         }
 
+        if ctx.in_function && !ctx.in_async {
+            self.emit_err(self.input.cur_span(), SyntaxError::AwaitInFunction);
+        }
+
         if ctx.in_parameters && !ctx.in_function {
             self.emit_err(span, SyntaxError::AwaitParamInAsync);
         }

diff --git a/crates/swc_ecma_parser/src/parser/stmt.rs b/crates/swc_ecma_parser/src/parser/stmt.rs
@@ -2499,4 +2499,32 @@ const foo;"#;
 
         test_parser(src, Default::default(), |p| p.parse_script());
     }
+
+    #[test]
+    fn issue_6301_await_expr_stmt_2() {
+        let src = "function test() { await; }";
+
+        test_parser(src, Default::default(), |p| p.parse_script());
+    }
+
+    #[test]
+    fn issue_6301_await_expr_stmt_3() {
+        let src = "function test() { await, await; }";
+
+        test_parser(src, Default::default(), |p| p.parse_script());
+    }
+
+    #[test]
+    fn issue_6301_await_expr_stmt_4() {
+        let src = "function test() { [await]; }";
+
+        test_parser(src, Default::default(), |p| p.parse_script());
+    }
+
+    #[test]
+    fn issue_6301_await_expr_stmt_5() {
+        let src = "function test() { (await); }";
+
+        test_parser(src, Default::default(), |p| p.parse_script());
+    }
 }
diff --git a/crates/swc_ecma_parser/tests/test262-error-references/fail/1aefe47e20eb91fa.module.js.stderr b/crates/swc_ecma_parser/tests/test262-error-references/fail/1aefe47e20eb91fa.module.js.stderr
@@ -1,12 +1,11 @@
 
-  x Unexpected token `<eof>`. Expected this, import, async, function, [ for array literal, { for object literal, @ for decorator, function, class, null, true, false, number, bigint, string, regexp,
-  | ` for template literal, (, or an identifier
+  x top level await requires target to es2017 or higher and topLevelAwait:true for ecmascript
    ,-[$DIR/tests/test262-parser/fail/1aefe47e20eb91fa.module.js:1:1]
  1 | await
    : ^^^^^
    `----
 
-  x top level await requires target to es2017 or higher and topLevelAwait:true for ecmascript
+  x `await` cannot be used as an identifier in an async context
    ,-[$DIR/tests/test262-parser/fail/1aefe47e20eb91fa.module.js:1:1]
  1 | await
    : ^^^^^