fix(es/parser): Fix parsing of abstract class over multiple lines (#1837

) swc_ecma_parser: - Don't allow `abstract` and `class` to be on different lines.
swc-project · Jun 20, 2021 · 6c49279 · 6c49279
1 parent 11f75df
commit 6c49279
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 7 deletions.
diff --git a/ecmascript/parser/Cargo.toml b/ecmascript/parser/Cargo.toml
@@ -7,7 +7,7 @@ include = ["Cargo.toml", "src/**/*.rs", "examples/**/*.rs"]
 license = "Apache-2.0/MIT"
 name = "swc_ecma_parser"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.60.0"
+version = "0.60.1"
 
 [features]
 default = []

diff --git a/ecmascript/parser/src/parser/stmt/module_item.rs b/ecmascript/parser/src/parser/stmt/module_item.rs
@@ -339,7 +339,10 @@ impl<'a, I: Tokens> Parser<I> {
 
         if !type_only && export_ns.is_none() && eat!(self, "default") {
             if self.input.syntax().typescript() {
-                if is!(self, "abstract") && peeked_is!(self, "class") {
+                if is!(self, "abstract")
+                    && peeked_is!(self, "class")
+                    && !self.input.has_linebreak_between_cur_and_peeked()
+                {
                     let class_start = cur_pos!(self);
                     assert_and_bump!(self, "abstract");
                     let _ = cur!(self, true);

diff --git a/ecmascript/parser/src/parser/typescript.rs b/ecmascript/parser/src/parser/typescript.rs
@@ -2304,7 +2304,7 @@ impl<I: Tokens> Parser<I> {
     ) -> PResult<Option<Decl>> {
         match value {
             js_word!("abstract") => {
-                if next || is!(self, "class") {
+                if next || (is!(self, "class") && !self.input.had_line_break_before_cur()) {
                     if next {
                         bump!(self);
                     }

diff --git a/.../classes/classDeclarations/classAbstractKeyword/classAbstractSingleLineDecl/input.ts.json b/.../classes/classDeclarations/classAbstractKeyword/classAbstractSingleLineDecl/input.ts.json
@@ -32,6 +32,24 @@
       "superTypeParams": null,
       "implements": []
     },
+    {
+      "type": "ExpressionStatement",
+      "span": {
+        "start": 21,
+        "end": 29,
+        "ctxt": 0
+      },
+      "expression": {
+        "type": "Identifier",
+        "span": {
+          "start": 21,
+          "end": 29,
+          "ctxt": 0
+        },
+        "value": "abstract",
+        "optional": false
+      }
+    },
     {
       "type": "ClassDeclaration",
       "identifier": {
@@ -46,18 +64,36 @@
       },
       "declare": false,
       "span": {
-        "start": 21,
+        "start": 30,
         "end": 40,
         "ctxt": 0
       },
       "decorators": [],
       "body": [],
       "superClass": null,
-      "isAbstract": true,
+      "isAbstract": false,
       "typeParams": null,
       "superTypeParams": null,
       "implements": []
     },
+    {
+      "type": "ExpressionStatement",
+      "span": {
+        "start": 42,
+        "end": 50,
+        "ctxt": 0
+      },
+      "expression": {
+        "type": "Identifier",
+        "span": {
+          "start": 42,
+          "end": 50,
+          "ctxt": 0
+        },
+        "value": "abstract",
+        "optional": false
+      }
+    },
     {
       "type": "ClassDeclaration",
       "identifier": {
@@ -72,14 +108,14 @@
       },
       "declare": false,
       "span": {
-        "start": 42,
+        "start": 52,
         "end": 62,
         "ctxt": 0
       },
       "decorators": [],
       "body": [],
       "superClass": null,
-      "isAbstract": true,
+      "isAbstract": false,
       "typeParams": null,
       "superTypeParams": null,
       "implements": []