Fix bound catchExprs

wcjohnson · Oct 25, 2017 · d33d831 · d33d831
1 parent 5a298ea
commit d33d831
Show file tree

Hide file tree

Showing 3 changed files with 169 additions and 1 deletion.
diff --git a/src/plugins/catchExpression.js b/src/plugins/catchExpression.js
@@ -47,7 +47,7 @@ export default function(parser) {
     this.state.inMatchCaseTest = true;
 
     this.parseCatchCaseAtoms(node);
-    if (this.isContextual("as")) {
+    if (this.eatContextual("as")) {
       this.parseCatchCaseBinding(node);
     }
 

diff --git a/test/fixtures/catch-expression/binding/basic/actual.js b/test/fixtures/catch-expression/binding/basic/actual.js
@@ -0,0 +1,2 @@
+a
+  catch Error as err: err
diff --git a/test/fixtures/catch-expression/binding/basic/expected.json b/test/fixtures/catch-expression/binding/basic/expected.json
@@ -0,0 +1,166 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 27,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 25
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 27,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 25
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 27,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 25
+          }
+        },
+        "expression": {
+          "type": "CatchExpression",
+          "start": 0,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 25
+            }
+          },
+          "expression": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "a"
+            },
+            "name": "a"
+          },
+          "cases": [
+            {
+              "type": "CatchCase",
+              "start": 4,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 25
+                }
+              },
+              "atoms": [
+                {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 13
+                    },
+                    "identifierName": "Error"
+                  },
+                  "name": "Error"
+                }
+              ],
+              "binding": {
+                "type": "Identifier",
+                "start": 19,
+                "end": 22,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 20
+                  },
+                  "identifierName": "err"
+                },
+                "name": "err"
+              },
+              "consequent": {
+                "type": "ExpressionStatement",
+                "start": 24,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 25
+                  }
+                },
+                "expression": {
+                  "type": "Identifier",
+                  "start": 24,
+                  "end": 27,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 22
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 25
+                    },
+                    "identifierName": "err"
+                  },
+                  "name": "err"
+                }
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}