Skip to content

Commit badd4eb

Browse files
authored
fix: correctly handle rules that are missing meta or have meta / create defined in variables (#225)
1 parent 6a09dbe commit badd4eb

36 files changed

+444
-170
lines changed

docs/rules/no-deprecated-context-methods.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ Examples of **incorrect** code for this rule:
3939
module.exports = {
4040
create (context) {
4141
return {
42-
Program (node) {
43-
const firstToken = context.getFirstToken(node);
42+
Program (ast) {
43+
const firstToken = context.getFirstToken(ast);
4444
},
4545
};
4646
},
@@ -55,8 +55,8 @@ module.exports = {
5555
const sourceCode = context.getSourceCode();
5656

5757
return {
58-
Program (node) {
59-
const firstToken = sourceCode.getFirstToken(node);
58+
Program (ast) {
59+
const firstToken = sourceCode.getFirstToken(ast);
6060
},
6161
};
6262
},

lib/rules/fixer-return.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ module.exports = {
9393
}
9494

9595
return {
96-
Program (node) {
97-
contextIdentifiers = utils.getContextIdentifiers(context, node);
96+
Program (ast) {
97+
const sourceCode = context.getSourceCode();
98+
contextIdentifiers = utils.getContextIdentifiers(sourceCode.scopeManager, ast);
9899
},
99100

100101
// Stacks this function's information.

lib/rules/no-deprecated-context-methods.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ module.exports = {
5858
// ----------------------------------------------------------------------
5959

6060
return {
61-
'Program:exit' () {
62-
[...utils.getContextIdentifiers(context, sourceCode.ast)]
61+
'Program:exit' (ast) {
62+
[...utils.getContextIdentifiers(sourceCode.scopeManager, ast)]
6363
.filter(
6464
contextId =>
6565
contextId.parent.type === 'MemberExpression' &&

lib/rules/no-deprecated-report-api.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ module.exports = {
3636
// ----------------------------------------------------------------------
3737

3838
return {
39-
Program (node) {
40-
contextIdentifiers = utils.getContextIdentifiers(context, node);
39+
Program (ast) {
40+
contextIdentifiers = utils.getContextIdentifiers(sourceCode.scopeManager, ast);
4141
},
4242
CallExpression (node) {
4343
if (

lib/rules/no-missing-placeholders.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ module.exports = {
3737

3838
return {
3939
Program (ast) {
40-
contextIdentifiers = utils.getContextIdentifiers(context, ast);
40+
const sourceCode = context.getSourceCode();
41+
contextIdentifiers = utils.getContextIdentifiers(sourceCode.scopeManager, ast);
4142
},
4243
CallExpression (node) {
4344
if (

lib/rules/no-unused-placeholders.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ module.exports = {
3737

3838
return {
3939
Program (ast) {
40-
contextIdentifiers = utils.getContextIdentifiers(context, ast);
40+
const sourceCode = context.getSourceCode();
41+
contextIdentifiers = utils.getContextIdentifiers(sourceCode.scopeManager, ast);
4142
},
4243
CallExpression (node) {
4344
if (

lib/rules/no-useless-token-range.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module.exports = {
107107

108108
return {
109109
'Program:exit' (ast) {
110-
[...utils.getSourceCodeIdentifiers(context, ast)]
110+
[...utils.getSourceCodeIdentifiers(sourceCode.scopeManager, ast)]
111111
.filter(identifier => identifier.parent.type === 'MemberExpression' &&
112112
identifier.parent.object === identifier &&
113113
identifier.parent.property.type === 'Identifier' &&

lib/rules/prefer-message-ids.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ module.exports = {
3636

3737
return {
3838
Program (ast) {
39-
contextIdentifiers = utils.getContextIdentifiers(context, ast);
39+
contextIdentifiers = utils.getContextIdentifiers(sourceCode.scopeManager, ast);
4040

41-
if (info === null || info.meta === null) {
41+
if (info === null) {
4242
return;
4343
}
4444

@@ -49,7 +49,7 @@ module.exports = {
4949
metaNode.properties.find(p => p.type === 'Property' && utils.getKeyName(p) === 'messages');
5050

5151
if (!messagesNode) {
52-
context.report({ node: metaNode, messageId: 'messagesMissing' });
52+
context.report({ node: metaNode || info.create, messageId: 'messagesMissing' });
5353
return;
5454
}
5555

lib/rules/prefer-placeholders.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ module.exports = {
3939
// ----------------------------------------------------------------------
4040

4141
return {
42-
Program (node) {
43-
contextIdentifiers = utils.getContextIdentifiers(context, node);
42+
Program (ast) {
43+
contextIdentifiers = utils.getContextIdentifiers(scopeManager, ast);
4444
},
4545
CallExpression (node) {
4646
if (

lib/rules/prefer-replace-text.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ module.exports = {
3838
let contextIdentifiers;
3939

4040
return {
41-
Program (node) {
42-
contextIdentifiers = utils.getContextIdentifiers(context, node);
41+
Program (ast) {
42+
contextIdentifiers = utils.getContextIdentifiers(sourceCode.scopeManager, ast);
4343
},
4444

4545
// Stacks this function's information.

0 commit comments

Comments
 (0)