tools: remove conditional assignment in custom ESLint rule

Trott · danielleadams · commit 3ecc964a2918 · 2022-01-31T23:54:41.000-05:00
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>
diff --git a/tools/eslint-rules/no-duplicate-requires.js b/tools/eslint-rules/no-duplicate-requires.js
@@ -10,18 +10,19 @@ const { isRequireCall, isString } = require('./rules-utils.js');
 // Rule Definition
 //------------------------------------------------------------------------------
 
+const secondLevelTypes = [
+  'FunctionDeclaration', 'FunctionExpression', 'ArrowFunctionExpression',
+  'ClassBody', 'MethodDefinition',
+];
 
 function isTopLevel(node) {
-  do {
-    if (node.type === 'FunctionDeclaration' ||
-        node.type === 'FunctionExpression' ||
-        node.type === 'ArrowFunctionExpression' ||
-        node.type === 'ClassBody' ||
-        node.type === 'MethodDefinition') {
-      return false;
+  while (!secondLevelTypes.includes(node.type)) {
+    node = node.parent;
+    if (!node) {
+      return true;
     }
-  } while (node = node.parent);
-  return true;
+  }
+  return false;
 }
 
 module.exports = (context) => {
