Merge 1b2ca07 into e7e49ec

sindresorhus · Mar 11, 2020 · 6c9909e · 6c9909e
2 parents e7e49ec + 1b2ca07
commit 6c9909e
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 1 deletion.
diff --git a/rules/consistent-function-scoping.js b/rules/consistent-function-scoping.js
@@ -75,9 +75,16 @@ function checkReferences(scope, parent, scopeManager) {
 		);
 }
 
+const isArrowFunctionWithThis = scope =>
+	scope.type === 'function' &&
+	scope.block &&
+	scope.block.type === 'ArrowFunctionExpression' &&
+	(scope.thisFound || scope.childScopes.some(scope => isArrowFunctionWithThis(scope)));
+
 function checkNode(node, scopeManager) {
 	const scope = scopeManager.acquire(node);
-	if (!scope) {
+
+	if (!scope || isArrowFunctionWithThis(scope)) {
 		return true;
 	}
 

diff --git a/test/consistent-function-scoping.js b/test/consistent-function-scoping.js
@@ -194,6 +194,32 @@ ruleTester.run('consistent-function-scoping', rule, {
 				return Bar;
 			};
 		`,
+		// `this`
+		outdent`
+			function doFoo(Foo) {
+				const doBar = () => this;
+				return doBar();
+			};
+		`,
+		outdent`
+			function doFoo(Foo) {
+				const doBar = () => () => this;
+				return doBar();
+			};
+		`,
+		outdent`
+			function doFoo(Foo) {
+				const doBar = () => () => () => this;
+				return doBar();
+			};
+		`,
+		// `arguments`
+		outdent`
+			function doFoo(Foo) {
+				const doBar = () => arguments;
+				return doBar();
+			};
+		`,
 		// #391
 		outdent`
 			const enrichErrors = (packageName, cliArgs, f) => async (...args) => {
@@ -311,6 +337,57 @@ ruleTester.run('consistent-function-scoping', rule, {
 			`,
 			errors: [createError({arrow: true})]
 		},
+		// `this`
+		{
+			code: outdent`
+				function doFoo(Foo) {
+					function doBar() {
+						return this;
+					}
+					return doBar();
+				};
+			`,
+			errors: [createError({name: 'doBar'})]
+		},
+		{
+			code: outdent`
+				function doFoo(Foo) {
+					const doBar = () => (function() {return this})();
+					return doBar();
+				};
+			`,
+			errors: [createError({name: 'doBar', arrow: true})]
+		},
+		{
+			code: outdent`
+				function doFoo(Foo) {
+					const doBar = () => (function() {return () => this})();
+					return doBar();
+				};
+			`,
+			errors: [createError({name: 'doBar', arrow: true})]
+		},
+		// `arguments`
+		{
+			code: outdent`
+				function doFoo(Foo) {
+					function doBar() {
+						return arguments;
+					}
+					return doBar();
+				};
+			`,
+			errors: [createError({name: 'doBar'})]
+		},
+		{
+			code: outdent`
+				function doFoo(Foo) {
+					const doBar = () => (function() {return arguments})();
+					return doBar();
+				};
+			`,
+			errors: [createError({name: 'doBar', arrow: true})]
+		},
 		{
 			code: outdent`
 				function doFoo(foo) {