diff --git a/rules/prevent-abbreviations.js b/rules/prevent-abbreviations.js index fd0be5cdc0..314ae579aa 100644 --- a/rules/prevent-abbreviations.js +++ b/rules/prevent-abbreviations.js @@ -6,12 +6,9 @@ const {defaultsDeep, upperFirst, lowerFirst} = require('lodash'); const getDocumentationUrl = require('./utils/get-documentation-url'); const avoidCapture = require('./utils/avoid-capture'); const cartesianProductSamples = require('./utils/cartesian-product-samples'); -const isSameNode = require('./utils/is-same-node'); const isShorthandPropertyIdentifier = require('./utils/is-shorthand-property-identifier'); -const isAssignmentPatternShorthandPropertyIdentifier = require('./utils/is-assignment-pattern-shorthand-property-identifier'); const isShorthandImportIdentifier = require('./utils/is-shorthand-import-identifier'); -const isShorthandExportIdentifier = require('./utils/is-shorthand-export-identifier'); -const renameIdentifier = require('./utils/rename-identifier') +const renameIdentifier = require('./utils/rename-identifier'); const isUpperCase = string => string === string.toUpperCase(); const isUpperFirst = string => isUpperCase(string[0]); diff --git a/rules/utils/is-assignment-pattern-shorthand-property-identifier.js b/rules/utils/is-assignment-pattern-shorthand-property-identifier.js index 2f09c6585e..c819b9a77d 100644 --- a/rules/utils/is-assignment-pattern-shorthand-property-identifier.js +++ b/rules/utils/is-assignment-pattern-shorthand-property-identifier.js @@ -8,4 +8,4 @@ module.exports = identifier => identifier.parent.parent.type === 'Property' && isSameNode(identifier, identifier.parent.parent.key) && identifier.parent.parent.value === identifier.parent && - identifier.parent.parent.shorthand + identifier.parent.parent.shorthand; diff --git a/rules/utils/is-shorthand-export-identifier.js b/rules/utils/is-shorthand-export-identifier.js index 8952276ce7..f8cb9d9ae2 100644 --- a/rules/utils/is-shorthand-export-identifier.js +++ b/rules/utils/is-shorthand-export-identifier.js @@ -1,6 +1,6 @@ 'use strict'; module.exports = identifier => - identifier.parent.type === 'ExportSpecifier' && + identifier.parent.type === 'ExportSpecifier' && identifier.parent.exported.name === identifier.name && - identifier.parent.local.name === identifier.name + identifier.parent.local.name === identifier.name; diff --git a/rules/utils/is-shorthand-import-identifier.js b/rules/utils/is-shorthand-import-identifier.js index 4c55559c79..5b132fd6db 100644 --- a/rules/utils/is-shorthand-import-identifier.js +++ b/rules/utils/is-shorthand-import-identifier.js @@ -1,8 +1,6 @@ 'use strict'; -const isSameNode = require('./is-same-node'); - module.exports = identifier => identifier.parent.type === 'ImportSpecifier' && identifier.parent.imported.name === identifier.name && - identifier.parent.local.name === identifier.name + identifier.parent.local.name === identifier.name; diff --git a/rules/utils/rename-identifier.js b/rules/utils/rename-identifier.js index fc4b3c5853..2edb64d23f 100644 --- a/rules/utils/rename-identifier.js +++ b/rules/utils/rename-identifier.js @@ -34,4 +34,4 @@ function renameIdentifier(identifier, name, fixer, sourceCode) { return fixer.replaceText(identifier, name); } -module.exports = renameIdentifier +module.exports = renameIdentifier;