Simplify prefer-set-has (#679)

Author: fisker

rules/prefer-set-has.js

@@ -1,6 +1,7 @@
 'use strict';
+const {findVariable} = require('eslint-utils');
 const getDocumentationUrl = require('./utils/get-documentation-url');
-const getReferences = require('./utils/get-references');
+const getVariableIdentifiers = require('./utils/get-variable-identifiers');
 const methodSelector = require('./utils/method-selector');
 
 // `[]`
@@ -107,45 +108,30 @@ const isIncludesCall = node => {
 };
 
 const create = context => {
-	const scope = context.getScope();
-	const declarations = new Set();
-
 	return {
 		[selector]: node => {
-			declarations.add(node);
-		},
-		'Program:exit'() {
-			if (declarations.size === 0) {
+			const variable = findVariable(context.getScope(), node);
+			const identifiers = getVariableIdentifiers(variable).filter(identifier => identifier !== node);
+
+			if (
+				identifiers.length === 0 ||
+				identifiers.some(node => !isIncludesCall(node))
+			) {
 				return;
 			}
 
-			const references = getReferences(scope);
-			for (const declaration of declarations) {
-				const variable = references
-					.find(({identifier}) => identifier === declaration)
-					.resolved;
-				const nodes = variable.references
-					.map(({identifier}) => identifier)
-					.filter(node => node !== declaration);
-
-				if (
-					nodes.length > 0 &&
-					nodes.every(node => isIncludesCall(node))
-				) {
-					context.report({
-						node: declaration,
-						messageId: MESSAGE_ID,
-						data: {
-							name: declaration.name
-						},
-						fix: fixer => [
-							fixer.insertTextBefore(declaration.parent.init, 'new Set('),
-							fixer.insertTextAfter(declaration.parent.init, ')'),
-							...nodes.map(node => fixer.replaceText(node.parent.property, 'has'))
-						]
-					});
-				}
-			}
+			context.report({
+				node,
+				messageId: MESSAGE_ID,
+				data: {
+					name: node.name
+				},
+				fix: fixer => [
+					fixer.insertTextBefore(node.parent.init, 'new Set('),
+					fixer.insertTextAfter(node.parent.init, ')'),
+					...identifiers.map(identifier => fixer.replaceText(identifier.parent.property, 'has'))
+				]
+			});
 		}
 	};
 };

test/prefer-set-has.js

@@ -270,6 +270,12 @@ ruleTester.run(ruleId, rule, {
 		outdent`
 			const foo = bar.notListed();
 			const exists = foo.includes(1);
+		`,
+
+		// `lodash`
+		outdent`
+			const foo = _.map([1, 2, 3], value => value);
+			const exists = _.includes(foo, 1);
 		`
 	],
 	invalid: [
@@ -338,6 +344,44 @@ ruleTester.run(ruleId, rule, {
 				...createError('bar')
 			]
 		},
+		// Different scope
+		{
+			code: outdent`
+				const foo = [1, 2, 3];
+				const exists = foo.includes(1);
+				const bar = [1, 2, 3];
+
+				function outer(find) {
+					const foo = [1, 2, 3];
+					const exists = foo.includes(1);
+
+					function inner(find) {
+						const bar = [1, 2, 3];
+						const exists = bar.includes(1);
+					}
+				}
+			`,
+			output: outdent`
+				const foo = new Set([1, 2, 3]);
+				const exists = foo.has(1);
+				const bar = [1, 2, 3];
+
+				function outer(find) {
+					const foo = new Set([1, 2, 3]);
+					const exists = foo.has(1);
+
+					function inner(find) {
+						const bar = new Set([1, 2, 3]);
+						const exists = bar.has(1);
+					}
+				}
+			`,
+			errors: [
+				...createError('foo'),
+				...createError('foo'),
+				...createError('bar')
+			]
+		},
 
 		// `Array()`
 		{
@@ -402,6 +446,23 @@ ruleTester.run(ruleId, rule, {
 				const exists = foo.has(1);
 			`,
 			errors: createError('foo')
-		}))
+		})),
+
+		// `lodash`
+		// `bar` is not `array`, but code not broken
+		// See https://github.com/sindresorhus/eslint-plugin-unicorn/pull/641
+		{
+			code: outdent`
+				const foo = _([1,2,3]);
+				const bar = foo.map(value => value);
+				const exists = bar.includes(1);
+			`,
+			output: outdent`
+				const foo = _([1,2,3]);
+				const bar = new Set(foo.map(value => value));
+				const exists = bar.has(1);
+			`,
+			errors: createError('bar')
+		}
 	]
 });