tools: replace custom ESLint timers rule

ESLint 3.19.0 allows the specification of selectors that represent disallowed syntax. Replace our custom rule for timer arguments with a pair of `no-restricted-syntax` option objects. PR-URL: nodejs/node#12504 Reviewed-By: Myles Borins <[email protected]>
michielbaird · Jul 19, 2017 · 26f0bc1 · 26f0bc1
1 parent dabf807
commit 26f0bc1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 26 deletions.
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -100,6 +100,13 @@ rules:
   new-parens: 2
   no-mixed-spaces-and-tabs: 2
   no-multiple-empty-lines: [2, {max: 2, maxEOF: 0, maxBOF: 0}]
+  no-restricted-syntax: [2, {
+    selector: "CallExpression[callee.name='setTimeout'][arguments.length<2]",
+    message: "setTimeout() must be invoked with at least two arguments."
+  }, {
+    selector: "CallExpression[callee.name='setInterval'][arguments.length<2]",
+    message: "setInterval() must be invoked with at least 2 arguments"
+  }]
   no-tabs: 2
   no-trailing-spaces: 2
   operator-linebreak: [2, after, {overrides: {'?': ignore, ':': ignore}}]
@@ -132,7 +139,6 @@ rules:
   assert-fail-single-argument: 2
   assert-throws-arguments: [2, { requireTwo: false }]
   new-with-error: [2, Error, RangeError, TypeError, SyntaxError, ReferenceError]
-  timer-arguments: 2
 
 # Global scoped method and vars
 globals:

diff --git a/tools/eslint-rules/timer-arguments.js b/tools/eslint-rules/timer-arguments.js