Merge 76b14da into 7aa2dc4

rules/utils/avoid-capture.js

@@ -28,13 +28,32 @@ const nameCollidesWithArgumentsSpecial = (name, scopes, isStrict) => {
 	return isStrict || scopes.some(scopeHasArgumentsSpecial);
 };
 
+/*
+Unresolved reference is probably from the global scope, should avoid use that name, like `foo` and `bar` bellow
+
+function unicorn() {
+	return foo;
+}
+
+function unicorn() {
+	return function() {
+		return bar;
+	};
+}
+*/
+const isUnresolvedName = (name, scopes) => scopes.some(scope =>
+	scope.references.some(reference => reference.identifier && reference.identifier.name === name && !reference.resolved) ||
+	isUnresolvedName(name, scope.childScopes)
+);
+
 const isSafeName = (name, scopes, ecmaVersion, isStrict) => {
 	ecmaVersion = Math.min(6, ecmaVersion); // 6 is the latest version understood by `reservedWords`
 
 	return (
 		!someScopeHasVariableName(name, scopes) &&
 		!reservedWords.check(name, ecmaVersion, isStrict) &&
-		!nameCollidesWithArgumentsSpecial(name, scopes, isStrict)
+		!nameCollidesWithArgumentsSpecial(name, scopes, isStrict) &&
+		!isUnresolvedName(name, scopes)
 	);
 };
 

rules/utils/resolve-variable-name.js

@@ -17,6 +17,4 @@ module.exports = (name, scope) => {
 
 		scope = scope.upper;
 	}
-
-	return undefined;
 };

test/prevent-abbreviations.js

@@ -1085,7 +1085,94 @@ ruleTester.run('prevent-abbreviations', rule, {
 			`,
 			output: outdent`
 				function unicorn(unicorn) {
-					const {prop: property = {}} = unicorn;
+					const {prop: property_ = {}} = unicorn;
+					return property;
+				}
+			`,
+			errors: createErrors()
+		},
+		{
+			code: outdent`
+				const property = '';
+				function unicorn() {
+					const prop = 1;
+					return property;
+				}
+			`,
+			output: outdent`
+				const property = '';
+				function unicorn() {
+					const property_ = 1;
+					return property;
+				}
+			`,
+			errors: createErrors()
+		},
+		{
+			code: outdent`
+				function unicorn() {
+					const prop = 1;
+					return function () {
+						return property;
+					};
+				}
+			`,
+			output: outdent`
+				function unicorn() {
+					const property_ = 1;
+					return function () {
+						return property;
+					};
+				}
+			`,
+			errors: createErrors()
+		},
+		{
+			code: outdent`
+				let property;
+				function unicorn() {
+					const prop = 1;
+					return property;
+				}
+			`,
+			output: outdent`
+				let property;
+				function unicorn() {
+					const property_ = 1;
+					return property;
+				}
+			`,
+			errors: createErrors()
+		},
+		{
+			code: outdent`
+				/*global property:true*/
+				function unicorn() {
+					const prop = 1;
+					return property;
+				}
+			`,
+			output: outdent`
+				/*global property:true*/
+				function unicorn() {
+					const property_ = 1;
+					return property;
+				}
+			`,
+			errors: createErrors()
+		},
+		{
+			code: outdent`
+				/*global property:false*/
+				function unicorn() {
+					const prop = 1;
+					return property;
+				}
+			`,
+			output: outdent`
+				/*global property:false*/
+				function unicorn() {
+					const property_ = 1;
 					return property;
 				}
 			`,
@@ -1512,7 +1599,7 @@ babelRuleTester.run('prevent-abbreviations', rule, {
 			`,
 			output: outdent`
 				function unicorn(unicorn) {
-					const {prop: property = {}} = unicorn;
+					const {prop: property_ = {}} = unicorn;
 					return property;
 				}
 			`,