From 2a1efcd2112c31dfd26fbb579478183b32d3169d Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 1 Feb 2020 16:12:02 +0800 Subject: [PATCH] Refactoring: Invert to `isValueNotUsable` --- rules/prefer-modern-dom-apis.js | 10 +++++----- rules/prefer-node-append.js | 4 ++-- rules/prefer-node-remove.js | 4 ++-- .../utils/{is-value-used.js => is-value-not-usable.js} | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename rules/utils/{is-value-used.js => is-value-not-usable.js} (57%) diff --git a/rules/prefer-modern-dom-apis.js b/rules/prefer-modern-dom-apis.js index 9b62655c6a..fb47042889 100644 --- a/rules/prefer-modern-dom-apis.js +++ b/rules/prefer-modern-dom-apis.js @@ -1,6 +1,6 @@ 'use strict'; const getDocumentationUrl = require('./utils/get-documentation-url'); -const isValueUsed = require('./utils/is-value-used'); +const isValueNotUsable = require('./utils/is-value-not-usable'); const getArgumentNameForReplaceChildOrInsertBefore = nodeArguments => { if (nodeArguments.type === 'Identifier') { @@ -42,15 +42,15 @@ const checkForReplaceChildOrInsertBefore = (context, node) => { const preferredSelector = forbiddenIdentifierNames.get(identifierName); - const fix = isValueUsed(node) ? + const fix = isValueNotUsable(node) ? // Report error when the method is part of a variable assignment // but don't offer to autofix `.replaceWith()` and `.before()` // which don't have a return value. - undefined : fixer => fixer.replaceText( node, `${oldChildNodeArgument}.${preferredSelector}(${newChildNodeArgument})` - ); + ) : + undefined; return context.report({ node, @@ -103,7 +103,7 @@ const checkForInsertAdjacentTextOrInsertAdjacentElement = (context, node) => { nodeArguments[1] ); - const fix = identifierName === 'insertAdjacentElement' && isValueUsed(node) ? + const fix = identifierName === 'insertAdjacentElement' && !isValueNotUsable(node) ? // Report error when the method is part of a variable assignment // but don't offer to autofix `.insertAdjacentElement()` // which doesn't have a return value. diff --git a/rules/prefer-node-append.js b/rules/prefer-node-append.js index 4b69928c1d..ebe51277b6 100644 --- a/rules/prefer-node-append.js +++ b/rules/prefer-node-append.js @@ -1,6 +1,6 @@ 'use strict'; const getDocumentationUrl = require('./utils/get-documentation-url'); -const isValueUsed = require('./utils/is-value-used'); +const isValueNotUsable = require('./utils/is-value-not-usable'); const getMethodName = memberExpression => memberExpression.property.name; @@ -10,7 +10,7 @@ const create = context => { const {callee} = node; if (callee.type === 'MemberExpression' && getMethodName(callee) === 'appendChild') { - const fix = isValueUsed(node) ? undefined : fixer => fixer.replaceText(callee.property, 'append'); + const fix = isValueNotUsable(node) ? fixer => fixer.replaceText(callee.property, 'append') : undefined; context.report({ node, diff --git a/rules/prefer-node-remove.js b/rules/prefer-node-remove.js index b5d6a28079..2028e99f6d 100644 --- a/rules/prefer-node-remove.js +++ b/rules/prefer-node-remove.js @@ -1,6 +1,6 @@ 'use strict'; const getDocumentationUrl = require('./utils/get-documentation-url'); -const isValueUsed = require('./utils/is-value-used'); +const isValueNotUsable = require('./utils/is-value-not-usable'); const getMethodName = callee => { const {property} = callee; @@ -66,7 +66,7 @@ const create = context => { const argumentName = getArgumentName(node.arguments); if (argumentName) { - const fix = isValueUsed(node) ? undefined : fixer => fixer.replaceText(node, `${argumentName}.remove()`); + const fix = isValueNotUsable(node) ? fixer => fixer.replaceText(node, `${argumentName}.remove()`) : undefined; context.report({ node, diff --git a/rules/utils/is-value-used.js b/rules/utils/is-value-not-usable.js similarity index 57% rename from rules/utils/is-value-used.js rename to rules/utils/is-value-not-usable.js index bdd6655398..16faac6657 100644 --- a/rules/utils/is-value-used.js +++ b/rules/utils/is-value-not-usable.js @@ -3,5 +3,5 @@ module.exports = function (node) { const {parent} = node; - return parent && parent.type !== 'ExpressionStatement'; + return !parent || parent.type === 'ExpressionStatement'; };