use find() instead of recursion

jsx-eslint · Nov 18, 2022 · 34a9d4f · 34a9d4f
1 parent 6f5eacc
commit 34a9d4f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/lib/.DS_Store b/lib/.DS_Store
diff --git a/lib/rules/jsx-newline.js b/lib/rules/jsx-newline.js
@@ -77,15 +77,9 @@ module.exports = {
       return /^\s*{\/\*/.test(elementRawValue);
     }
 
-    function findFirstNonBlockComment(index, elements) {
-      if (index >= elements.length) return;
-
-      const element = elements[index];
-      const isElementJSX = element.type === 'JSXElement' || element.type === 'JSXExpressionContainer';
-
-      if (!isBlockCommentInCurlyBraces(element) && isElementJSX) return element;
-
-      return findFirstNonBlockComment(index + 1, elements);
+    function findFirstNonBlockComment(startIndex, elements) {
+      const remainingElements = elements.slice(startIndex);
+      return remainingElements.find((element) => !isBlockCommentInCurlyBraces(element) && (element.type === 'JSXElement' || element.type === 'JSXExpressionContainer'));
     }
 
     return {
@@ -116,8 +110,8 @@ module.exports = {
                 && (
                   isMultilined(element)
                   || isMultilined(findFirstNonBlockComment(index + 2, elements)
+                  )
                 )
-              )
               ) {
                 if (!isWithoutNewLine) return;
 

diff --git a/tests/.DS_Store b/tests/.DS_Store
diff --git a/tests/lib/.DS_Store b/tests/lib/.DS_Store