Use context.sourceCode.isGlobalReference() in more places (#2685)

Author: fisker

rules/error-message.js

@@ -1,5 +1,4 @@
 import {getStaticValue} from '@eslint-community/eslint-utils';
-import isShadowed from './utils/is-shadowed.js';
 import {isCallOrNewExpression} from './ast/index.js';
 import builtinErrors from './shared/builtin-errors.js';
 
@@ -20,15 +19,13 @@ const messageArgumentIndexes = new Map([
 /** @param {import('eslint').Rule.RuleContext} context */
 const create = context => {
 	context.on(['CallExpression', 'NewExpression'], expression => {
-		if (!isCallOrNewExpression(expression, {
-			names: builtinErrors,
-			optional: false,
-		})) {
-			return;
-		}
-
-		const scope = context.sourceCode.getScope(expression);
-		if (isShadowed(scope, expression.callee)) {
+		if (!(
+			isCallOrNewExpression(expression, {
+				names: builtinErrors,
+				optional: false,
+			})
+			&& context.sourceCode.isGlobalReference(expression.callee)
+		)) {
 			return;
 		}
 
@@ -61,7 +58,7 @@ const create = context => {
 			};
 		}
 
-		const staticResult = getStaticValue(node, scope);
+		const staticResult = getStaticValue(node, context.sourceCode.getScope(node));
 
 		// We don't know the value of `message`
 		if (!staticResult) {

rules/no-typeof-undefined.js

@@ -7,7 +7,7 @@ import {
 	needsSemicolon,
 	isParenthesized,
 	isOnSameLine,
-	isShadowed,
+	isUnresolvedVariable,
 } from './utils/index.js';
 
 const MESSAGE_ID_ERROR = 'no-typeof-undefined/error';
@@ -49,7 +49,7 @@ const create = context => {
 
 			const valueNode = typeofNode.argument;
 			const isGlobalVariable = valueNode.type === 'Identifier'
-				&& !isShadowed(sourceCode.getScope(valueNode), valueNode);
+				&& (sourceCode.isGlobalReference(valueNode) || isUnresolvedVariable(valueNode, context));
 
 			if (!checkGlobalVariables && isGlobalVariable) {
 				return;

rules/prefer-module.js

@@ -1,7 +1,6 @@
-import isShadowed from './utils/is-shadowed.js';
 import assertToken from './utils/assert-token.js';
 import {getCallExpressionTokens} from './utils/index.js';
-import {isStaticRequire, isReferenceIdentifier, isFunction} from './ast/index.js';
+import {isStaticRequire, isFunction} from './ast/index.js';
 import {removeParentheses, replaceReferenceIdentifier, removeSpacesAfter} from './fix/index.js';
 
 const ERROR_USE_STRICT_DIRECTIVE = 'error/use-strict-directive';
@@ -56,6 +55,14 @@ const suggestions = new Map([
 	],
 ]);
 
+const commonJsGlobals = new Set([
+	'exports',
+	'require',
+	'module',
+	'__filename',
+	'__dirname',
+]);
+
 function fixRequireCall(node, sourceCode) {
 	if (!isStaticRequire(node.parent) || node.parent.callee !== node) {
 		return;
@@ -281,16 +288,7 @@ function create(context) {
 	});
 
 	context.on('Identifier', node => {
-		if (
-			!isReferenceIdentifier(node, [
-				'exports',
-				'require',
-				'module',
-				'__filename',
-				'__dirname',
-			])
-			|| isShadowed(sourceCode.getScope(node), node)
-		) {
+		if (!commonJsGlobals.has(node.name) || !context.sourceCode.isGlobalReference(node)) {
 			return;
 		}
 

rules/utils/index.js

@@ -40,7 +40,7 @@ export {default as isNodeValueNotFunction} from './is-node-value-not-function.js
 export {default as isOnSameLine} from './is-on-same-line.js';
 export {default as isSameIdentifier} from './is-same-identifier.js';
 export {default as isSameReference} from './is-same-reference.js';
-export {default as isShadowed} from './is-shadowed.js';
+export {default as isUnresolvedVariable} from './is-unresolved-variable.js';
 export {default as isShorthandImportLocal} from './is-shorthand-import-local.js';
 export {default as isShorthandPropertyValue} from './is-shorthand-property-value.js';
 export {default as isValueNotUsable} from './is-value-not-usable.js';

rules/utils/is-shadowed.js

@@ -0,0 +1,13 @@
+/**
+Checks if the given identifier node is shadowed in the given scope.
+
+@param {string} node - The identifier node to check
+@param {import('eslint').Rule.RuleContext} context - The ESLint rule context.
+@returns {boolean} Whether or not the name is unresolved.
+*/
+export default function isUnresolvedVariable(node, context) {
+	const scope = context.sourceCode.getScope(node);
+	const reference = scope.references
+		.find(reference => reference.identifier === node);
+	return !reference.resolved;
+}