Upgrade: espree@next

eslint · Jun 1, 2018 · 6bb5c3c · 6bb5c3c
1 parent 400d4b5
commit 6bb5c3c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/lib/rules/no-catch-shadow.js b/lib/rules/no-catch-shadow.js
@@ -53,7 +53,7 @@ module.exports = {
 
         return {
 
-            CatchClause(node) {
+            "CatchClause[param!=null]"(node) {
                 let scope = context.getScope();
 
                 /*

diff --git a/lib/rules/no-shadow-restricted-names.js b/lib/rules/no-shadow-restricted-names.js
@@ -47,21 +47,21 @@ module.exports = {
                 checkForViolation(node.id);
             },
             ArrowFunctionExpression(node) {
-                [].map.call(node.params, checkForViolation);
+                node.params.forEach(checkForViolation);
             },
             FunctionExpression(node) {
                 if (node.id) {
                     checkForViolation(node.id);
                 }
-                [].map.call(node.params, checkForViolation);
+                node.params.forEach(checkForViolation);
             },
             FunctionDeclaration(node) {
                 if (node.id) {
                     checkForViolation(node.id);
-                    [].map.call(node.params, checkForViolation);
                 }
+                node.params.forEach(checkForViolation);
             },
-            CatchClause(node) {
+            "CatchClause[param!=null]"(node) {
                 checkForViolation(node.param);
             }
         };

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "doctrine": "^2.1.0",
     "eslint-scope": "^4.0.0-alpha.0",
     "eslint-visitor-keys": "^1.0.0",
-    "espree": "^4.0.0-alpha.1",
+    "espree": "github:eslint/espree#upgrade-acorn-5.6",
     "esquery": "^1.0.1",
     "esutils": "^2.0.2",
     "file-entry-cache": "^2.0.0",

diff --git a/tests/lib/rules/no-catch-shadow.js b/tests/lib/rules/no-catch-shadow.js
@@ -40,6 +40,10 @@ ruleTester.run("no-catch-shadow", rule, {
         {
             code: "try {} catch (error) {}",
             env: { shelljs: false }
+        },
+        {
+            code: "try {} catch {}",
+            parserOptions: { ecmaVersion: 2019 }
         }
     ],
     invalid: [

diff --git a/tests/lib/rules/no-shadow-restricted-names.js b/tests/lib/rules/no-shadow-restricted-names.js
@@ -20,7 +20,11 @@ ruleTester.run("no-shadow-restricted-names", rule, {
         "!function foo(bar){ var baz; }",
         "!function(bar){ var baz; }",
         "try {} catch(e) {}",
-        { code: "export default function() {}", parserOptions: { sourceType: "module" } }
+        { code: "export default function() {}", parserOptions: { sourceType: "module" } },
+        {
+            code: "try {} catch {}",
+            parserOptions: { ecmaVersion: 2019 }
+        }
     ],
     invalid: [
         {