Chore: simplify range checks (yoda)

eslint · Mar 22, 2020 · 9953a04 · 9953a04
1 parent 1539805
commit 9953a04
Showing 1 changed file with 19 additions and 38 deletions.
diff --git a/lib/rules/yoda.js b/lib/rules/yoda.js
@@ -78,8 +78,6 @@ function looksLikeLiteral(node) {
 /**
  * Attempts to derive a Literal node from nodes that are treated like literals.
  * @param {ASTNode} node Node to normalize.
- * @param {number} [defaultValue] The default value to be returned if the node
- *                                is not a Literal.
  * @returns {ASTNode} One of the following options.
  *  1. The original node if the node is already a Literal
  *  2. A normalized Literal node with the negative number as the value if the
@@ -89,7 +87,7 @@ function looksLikeLiteral(node) {
  *  4. The Literal node which has the `defaultValue` argument if it exists.
  *  5. Otherwise `null`.
  */
-function getNormalizedLiteral(node, defaultValue) {
+function getNormalizedLiteral(node) {
     if (node.type === "Literal") {
         return node;
     }
@@ -110,14 +108,6 @@ function getNormalizedLiteral(node, defaultValue) {
         };
     }
 
-    if (defaultValue) {
-        return {
-            type: "Literal",
-            value: defaultValue,
-            raw: String(defaultValue)
-        };
-    }
-
     return null;
 }
 
@@ -247,23 +237,18 @@ module.exports = {
 
                 if (node.operator === "&&") {
                     leftLiteral = getNormalizedLiteral(left.left);
-                    rightLiteral = getNormalizedLiteral(right.right, Number.POSITIVE_INFINITY);
+                    rightLiteral = getNormalizedLiteral(right.right);
 
-                    if (leftLiteral && rightLiteral) {
-
-                        if (leftLiteral.value <= rightLiteral.value && same(left.right, right.left)) {
-                            return true;
-                        }
+                    if (leftLiteral === null && rightLiteral === null) {
+                        return false;
+                    }
 
-                        if (
-                            (typeof leftLiteral.value === "string" &&
-                            (typeof rightLiteral.value !== "string" && rightLiteral.value === Number.POSITIVE_INFINITY)) ||
-                            (typeof rightLiteral.value === "string" &&
-                            (typeof leftLiteral.value !== "string" && leftLiteral.value === Number.POSITIVE_INFINITY))
-                        ) {
+                    if (leftLiteral !== null && rightLiteral === null || rightLiteral !== null && leftLiteral === null) {
+                        return true;
+                    }
 
-                            return true;
-                        }
+                    if (leftLiteral.value <= rightLiteral.value && same(left.right, right.left)) {
+                        return true;
                     }
                 }
                 return false;
@@ -277,23 +262,19 @@ module.exports = {
                 let leftLiteral, rightLiteral;
 
                 if (node.operator === "||") {
-                    leftLiteral = getNormalizedLiteral(left.right, Number.NEGATIVE_INFINITY);
+                    leftLiteral = getNormalizedLiteral(left.right);
                     rightLiteral = getNormalizedLiteral(right.left);
 
-                    if (leftLiteral && rightLiteral) {
+                    if (leftLiteral === null && rightLiteral === null) {
+                        return false;
+                    }
 
-                        if ((leftLiteral.value <= rightLiteral.value) && same(left.left, right.right)) {
-                            return true;
-                        }
+                    if (leftLiteral !== null && rightLiteral === null || rightLiteral !== null && leftLiteral === null) {
+                        return true;
+                    }
 
-                        if (
-                            (typeof leftLiteral.value === "string" &&
-                            (typeof rightLiteral.value !== "string" && rightLiteral.value === Number.NEGATIVE_INFINITY)) ||
-                            (typeof rightLiteral.value === "string" &&
-                            (typeof leftLiteral.value !== "string" && leftLiteral.value === Number.NEGATIVE_INFINITY))
-                        ) {
-                            return true;
-                        }
+                    if ((leftLiteral.value <= rightLiteral.value) && same(left.left, right.right)) {
+                        return true;
                     }
                 }