refactor

Author: ota-meshi

lib/internal/disabled-area.js

@@ -154,10 +154,12 @@ class DisabledAreaForLanguagePlugin extends DisabledArea {
         const disableDirectives = sourceCode.getDisableDirectives()
         for (const directive of disableDirectives.directives) {
             if (
-                directive.type !== "disable" &&
-                directive.type !== "enable" &&
-                directive.type !== "disable-line" &&
-                directive.type !== "disable-next-line"
+                ![
+                    "disable",
+                    "enable",
+                    "disable-line",
+                    "disable-next-line",
+                ].includes(directive.type)
             ) {
                 continue
             }
@@ -205,10 +207,12 @@ class DisabledAreaForLegacy extends DisabledArea {
 
             const kind = directiveComment.kind
             if (
-                kind !== "eslint-disable" &&
-                kind !== "eslint-enable" &&
-                kind !== "eslint-disable-line" &&
-                kind !== "eslint-disable-next-line"
+                ![
+                    "eslint-disable",
+                    "eslint-enable",
+                    "eslint-disable-line",
+                    "eslint-disable-next-line",
+                ].includes(kind)
             ) {
                 continue
             }
@@ -251,11 +255,10 @@ module.exports = {
         let retv = pool.get(sourceCode.ast)
 
         if (retv == null) {
-            if (typeof sourceCode.getDisableDirectives === "function") {
-                retv = new DisabledAreaForLanguagePlugin()
-            } else {
-                retv = new DisabledAreaForLegacy()
-            }
+            retv =
+                typeof sourceCode.getDisableDirectives === "function"
+                    ? new DisabledAreaForLanguagePlugin()
+                    : new DisabledAreaForLegacy()
             retv._scan(sourceCode)
             pool.set(sourceCode.ast, retv)
         }

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

@@ -19,22 +19,24 @@ const pool = new WeakMap()
  * @returns {DirectiveComment[]} The directive comments.
  */
 function getAllDirectiveCommentsFromAllComments(sourceCode) {
-    /** @type {DirectiveComment[]} */
-    const result = []
-    for (const comment of sourceCode.getAllComments()) {
-        const directiveComment = utils.parseDirectiveComment(comment)
-        if (directiveComment != null) {
-            result.push({
-                kind: directiveComment.kind,
-                value: directiveComment.value,
-                description: directiveComment.description,
-                node: comment,
-                range: comment.range,
-                loc: comment.loc,
-            })
-        }
-    }
-    return result
+    return sourceCode
+        .getAllComments()
+        .map((comment) => ({
+            comment,
+            directiveComment: utils.parseDirectiveComment(comment),
+        }))
+        .filter(({ directiveComment }) => Boolean(directiveComment))
+        .map(
+            ({ comment, directiveComment }) =>
+                /** @type {DirectiveComment} */ ({
+                    kind: directiveComment.kind,
+                    value: directiveComment.value,
+                    description: directiveComment.description,
+                    node: comment,
+                    range: comment.range,
+                    loc: comment.loc,
+                })
+        )
 }
 
 /**
@@ -74,10 +76,12 @@ function getAllDirectiveCommentsFromInlineConfigNodes(sourceCode) {
         const directiveComment = utils.parseDirectiveText(commentValue)
         if (
             directiveComment != null &&
-            directiveComment.kind !== "eslint-disable" &&
-            directiveComment.kind !== "eslint-disable-line" &&
-            directiveComment.kind !== "eslint-disable-next-line" &&
-            directiveComment.kind !== "eslint-enable"
+            ![
+                "eslint-disable",
+                "eslint-disable-line",
+                "eslint-disable-next-line",
+                "eslint-enable",
+            ].includes(directiveComment.kind)
         ) {
             result.push({
                 kind: directiveComment.kind,
@@ -123,15 +127,11 @@ module.exports = {
         let result = pool.get(sourceCode.ast)
 
         if (result == null) {
-            if (
+            result =
                 typeof sourceCode.getInlineConfigNodes === "function" &&
                 typeof sourceCode.getDisableDirectives === "function"
-            ) {
-                result =
-                    getAllDirectiveCommentsFromInlineConfigNodes(sourceCode)
-            } else {
-                result = getAllDirectiveCommentsFromAllComments(sourceCode)
-            }
+                    ? getAllDirectiveCommentsFromInlineConfigNodes(sourceCode)
+                    : getAllDirectiveCommentsFromAllComments(sourceCode)
             pool.set(sourceCode.ast, result)
         }
 

lib/internal/utils.js

@@ -183,8 +183,7 @@ function divideDirectiveComment(value) {
 function getLoc(context, nodeOrToken) {
     const sourceCode =
         context.sourceCode || (context.getSourceCode && context.getSourceCode())
-    if (sourceCode && typeof sourceCode.getLoc === "function") {
-        return sourceCode.getLoc(nodeOrToken)
-    }
-    return nodeOrToken.loc
+    return sourceCode && typeof sourceCode.getLoc === "function"
+        ? sourceCode.getLoc(nodeOrToken)
+        : nodeOrToken.loc
 }