Skip to content

Commit 48edece

Browse files
aladdin-addaladdin-add
committed
fix: sourceCode.getScope?.()
1 parent 6d3eb81 commit 48edece

12 files changed

+16
-17
lines changed

‎lib/rules/fixer-return.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ module.exports = {
8181
return false;
8282
}
8383
const scope =
84-
(context.sourceCode || context.getSourceCode())?.getScope(node) ||
84+
(context.sourceCode || context.getSourceCode()).getScope?.(node) ||
8585
context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < 9.0.0
8686
const staticValue = getStaticValue(node, scope);
8787
if (!staticValue) {

‎lib/rules/no-missing-message-ids.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ module.exports = {
4848
},
4949

5050
CallExpression(node) {
51+
const scope = sourceCode.getScope?.(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < 9.0.0
5152
// Check for messageId properties used in known calls to context.report();
5253
if (
5354
node.callee.type === 'MemberExpression' &&
@@ -80,7 +81,7 @@ module.exports = {
8081
val.value,
8182
ruleInfo,
8283
scopeManager,
83-
sourceCode.getScope(node)
84+
scope
8485
)
8586
)
8687
// Couldn't find this messageId in `meta.messages`.

‎lib/rules/no-missing-placeholders.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ module.exports = {
4848
contextIdentifiers = utils.getContextIdentifiers(scopeManager, ast);
4949
},
5050
CallExpression(node) {
51-
const scope = sourceCode.getScope(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < 9.0.0
51+
const scope = sourceCode.getScope?.(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < 9.0.0
5252
if (
5353
node.callee.type === 'MemberExpression' &&
5454
contextIdentifiers.has(node.callee.object) &&

‎lib/rules/no-unused-message-ids.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module.exports = {
5757
return;
5858
}
5959

60-
const scope = sourceCode.getScope(ast);
60+
const scope = sourceCode.getScope?.(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < 9.0.0
6161

6262
const messageIdNodesUnused = messageIdNodes.filter(
6363
(node) => !messageIdsUsed.has(utils.getKeyName(node, scope))

‎lib/rules/no-unused-placeholders.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ module.exports = {
4747
contextIdentifiers = utils.getContextIdentifiers(scopeManager, ast);
4848
},
4949
CallExpression(node) {
50+
const scope = sourceCode.getScope?.(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < 9.0.0
5051
if (
5152
node.callee.type === 'MemberExpression' &&
5253
contextIdentifiers.has(node.callee.object) &&
@@ -74,7 +75,7 @@ module.exports = {
7475
obj.messageId.value,
7576
ruleInfo,
7677
scopeManager,
77-
sourceCode.getScope(node)
78+
scope
7879
);
7980
if (correspondingMessage) {
8081
obj.message = correspondingMessage.value;
@@ -86,10 +87,7 @@ module.exports = {
8687
for (const { message, data } of reportMessagesAndDataArray.filter(
8788
(obj) => obj.message
8889
)) {
89-
const messageStaticValue = getStaticValue(
90-
message,
91-
sourceCode.getScope(node)
92-
);
90+
const messageStaticValue = getStaticValue(message, scope);
9391
if (
9492
((message.type === 'Literal' &&
9593
typeof message.value === 'string') ||

‎lib/rules/prefer-message-ids.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module.exports = {
4343

4444
return {
4545
Program(ast) {
46-
const scope = sourceCode.getScope(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
46+
const scope = sourceCode.getScope?.(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
4747
contextIdentifiers = utils.getContextIdentifiers(
4848
sourceCode.scopeManager,
4949
ast

‎lib/rules/report-message-format.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ module.exports = {
6969

7070
return {
7171
Program(ast) {
72-
const scope = sourceCode.getScope(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
72+
const scope = sourceCode.getScope?.(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
7373
contextIdentifiers = utils.getContextIdentifiers(
7474
sourceCode.scopeManager,
7575
ast
@@ -97,7 +97,7 @@ module.exports = {
9797
.forEach((it) => processMessageNode(it, scope));
9898
},
9999
CallExpression(node) {
100-
const scope = sourceCode.getScope(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
100+
const scope = sourceCode.getScope?.(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
101101
if (
102102
node.callee.type === 'MemberExpression' &&
103103
contextIdentifiers.has(node.callee.object) &&

‎lib/rules/require-meta-docs-description.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module.exports = {
5050

5151
return {
5252
Program(ast) {
53-
const scope = sourceCode.getScope(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
53+
const scope = sourceCode.getScope?.(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
5454
const { scopeManager } = sourceCode;
5555

5656
const pattern =

‎lib/rules/require-meta-docs-url.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ module.exports = {
8080

8181
return {
8282
Program(ast) {
83-
const scope = sourceCode.getScope(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
83+
const scope = sourceCode.getScope?.(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
8484
const { scopeManager } = sourceCode;
8585

8686
const metaNode = ruleInfo.meta;

‎lib/rules/require-meta-fixable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ module.exports = {
7777
}
7878
},
7979
'Program:exit'(ast) {
80-
const scope = sourceCode.getScope(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
80+
const scope = sourceCode.getScope?.(ast) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
8181
const metaFixableProp =
8282
ruleInfo &&
8383
utils

‎lib/rules/require-meta-has-suggestions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = {
4444
* @returns {boolean} whether this property should be considered to contain suggestions
4545
*/
4646
function doesPropertyContainSuggestions(node) {
47-
const scope = sourceCode.getScope(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
47+
const scope = sourceCode.getScope?.(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
4848
const staticValue = getStaticValue(node.value, scope);
4949
if (
5050
!staticValue ||

‎lib/rules/require-meta-type.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = {
4646

4747
return {
4848
Program(node) {
49-
const scope = sourceCode.getScope(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
49+
const scope = sourceCode.getScope?.(node) || context.getScope(); // TODO: just use sourceCode.getScope() when we drop support for ESLint < v9.0.0
5050
const { scopeManager } = sourceCode;
5151

5252
const metaNode = ruleInfo.meta;

0 commit comments

Comments
 (0)