Commit dcada80
tools: remove conditional assignment in custom ESLint rule
These changes no-duplicate-require.js so that it doesn't use an
assignment in a conditional, which can be easy to misread as a
comparison rather than an assignment. It also means we change a do/while
(which we don't use much in our code) to the much more common while
construct.
PR-URL: #41325
Reviewed-By: Michaël Zasso <targos@protonmail.com>1 parent 3c8b25b commit dcada80
1 file changed
Lines changed: 10 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,18 +10,19 @@ const { isRequireCall, isString } = require('./rules-utils.js'); | |||
| 10 | 10 | // Rule Definition | |
| 11 | 11 | //------------------------------------------------------------------------------ | |
| 12 | 12 | ||
| 13 | + const secondLevelTypes = [ | ||
| 14 | + 'FunctionDeclaration', 'FunctionExpression', 'ArrowFunctionExpression', | ||
| 15 | + 'ClassBody', 'MethodDefinition', | ||
| 16 | + ]; | ||
| 13 | 17 | ||
| 14 | 18 | function isTopLevel(node) { | |
| 15 | - do { | ||
| 16 | - if (node.type === 'FunctionDeclaration' || | ||
| 17 | - node.type === 'FunctionExpression' || | ||
| 18 | - node.type === 'ArrowFunctionExpression' || | ||
| 19 | - node.type === 'ClassBody' || | ||
| 20 | - node.type === 'MethodDefinition') { | ||
| 21 | - return false; | ||
| 19 | + while (!secondLevelTypes.includes(node.type)) { | ||
| 20 | + node = node.parent; | ||
| 21 | + if (!node) { | ||
| 22 | + return true; | ||
| 22 | 23 | } | |
| 23 | - } while (node = node.parent); | ||
| 24 | - return true; | ||
| 24 | + } | ||
| 25 | + return false; | ||
| 25 | 26 | } | |
| 26 | 27 | ||
| 27 | 28 | module.exports = (context) => { | |
0 commit comments