refactor

Author: ota-meshi

lib/internal/get-all-directive-comments.js

@@ -44,58 +44,72 @@ function getAllDirectiveCommentsFromAllComments(sourceCode) {
  * @returns {DirectiveComment[]} The directive comments.
  */
 function getAllDirectiveCommentsFromInlineConfigNodes(sourceCode) {
-    /** @type {DirectiveComment[]} */
-    const result = []
-    const disableDirectives = sourceCode.getDisableDirectives()
-    for (const directive of disableDirectives.directives) {
-        result.push({
-            kind: `eslint-${directive.type}`,
-            value: directive.value,
-            description: directive.justification,
-            node: directive.node,
-            range: sourceCode.getRange(directive.node),
-            get loc() {
-                return sourceCode.getLoc(directive.node)
-            },
-        })
-    }
-    for (const node of sourceCode.getInlineConfigNodes()) {
-        const range = sourceCode.getRange(node)
-        // The node has intersection of the directive comment.
-        // So, we need to skip it.
-        if (
-            result.some(
-                (comment) =>
-                    comment.range[0] <= range[1] && range[0] <= comment.range[1]
-            )
-        ) {
-            continue
-        }
-        const nodeText = sourceCode.text.slice(range[0], range[1])
-        const commentValue = extractCommentContent(nodeText)
-        const directiveComment = utils.parseDirectiveText(commentValue)
-        if (
-            directiveComment != null &&
-            ![
-                "eslint-disable",
-                "eslint-disable-line",
-                "eslint-disable-next-line",
-                "eslint-enable",
-            ].includes(directiveComment.kind)
-        ) {
-            result.push({
-                kind: directiveComment.kind,
-                value: directiveComment.value,
-                description: directiveComment.description,
-                node,
-                range,
+    const result = sourceCode.getDisableDirectives().directives.map(
+        (directive) =>
+            /** @type {DirectiveComment} */ ({
+                kind: `eslint-${directive.type}`,
+                value: directive.value,
+                description: directive.justification,
+                node: directive.node,
+                range: sourceCode.getRange(directive.node),
                 get loc() {
-                    return sourceCode.getLoc(node)
+                    return sourceCode.getLoc(directive.node)
                 },
             })
-        }
-    }
-    return result
+    )
+
+    return result.concat(
+        sourceCode
+            .getInlineConfigNodes()
+            .map((node) => ({
+                node,
+                range: sourceCode.getRange(node),
+            }))
+            .filter(
+                ({ range }) =>
+                    // The node has intersection of the directive comment.
+                    // So, we need to skip it.
+                    !result.some(
+                        (comment) =>
+                            comment.range[0] <= range[1] &&
+                            range[0] <= comment.range[1]
+                    )
+            )
+            .map(({ node, range }) => {
+                const nodeText = sourceCode.text.slice(range[0], range[1])
+                const commentValue = extractCommentContent(nodeText)
+                const directiveComment = utils.parseDirectiveText(commentValue)
+
+                return {
+                    directiveComment,
+                    node,
+                    range,
+                }
+            })
+            .filter(
+                ({ directiveComment }) =>
+                    directiveComment != null &&
+                    ![
+                        "eslint-disable",
+                        "eslint-disable-line",
+                        "eslint-disable-next-line",
+                        "eslint-enable",
+                    ].includes(directiveComment.kind)
+            )
+            .map(
+                ({ directiveComment, node, range }) =>
+                    /** @type {DirectiveComment} */ ({
+                        kind: directiveComment.kind,
+                        value: directiveComment.value,
+                        description: directiveComment.description,
+                        node,
+                        range,
+                        get loc() {
+                            return sourceCode.getLoc(node)
+                        },
+                    })
+            )
+    )
 }
 
 function extractCommentContent(text) {