Skip to content

Commit 01003fa

Browse files
committed
fix: reporting location in no-missing-message-ids
1 parent e2f3deb commit 01003fa

File tree

2 files changed

+47
-17
lines changed

2 files changed

+47
-17
lines changed

lib/rules/no-missing-placeholders.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,11 @@ module.exports = {
8080
});
8181
}
8282

83-
for (const { message, data } of reportMessagesAndDataArray.filter(
84-
(obj) => obj.message
85-
)) {
83+
for (const {
84+
message,
85+
messageId,
86+
data,
87+
} of reportMessagesAndDataArray.filter((obj) => obj.message)) {
8688
const messageStaticValue = getStaticValue(
8789
message,
8890
context.getScope()
@@ -112,7 +114,7 @@ module.exports = {
112114

113115
if (!matchingProperty) {
114116
context.report({
115-
node: message,
117+
node: data || messageId || message,
116118
messageId: 'placeholderDoesNotExist',
117119
data: { missingKey: match[1] },
118120
});

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

+41-13
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ const RuleTester = require('eslint').RuleTester;
1717
* @param {string} missingKey The placeholder that is missing
1818
* @returns {object} An expected error
1919
*/
20-
function error(missingKey, type = 'Literal') {
21-
return { type, message: `The placeholder {{${missingKey}}} does not exist.` };
20+
function error(missingKey, type, extra) {
21+
return {
22+
type,
23+
message: `The placeholder {{${missingKey}}} does not exist.`,
24+
...extra,
25+
};
2226
}
2327

2428
// ------------------------------------------------------------------------------
@@ -232,7 +236,7 @@ ruleTester.run('no-missing-placeholders', rule, {
232236
}
233237
};
234238
`,
235-
errors: [error('bar')],
239+
errors: [error('bar', 'Literal')],
236240
},
237241
{
238242
code: `
@@ -246,7 +250,7 @@ ruleTester.run('no-missing-placeholders', rule, {
246250
}
247251
};
248252
`,
249-
errors: [error('bar')],
253+
errors: [error('bar', 'ObjectExpression')],
250254
},
251255
{
252256
code: `
@@ -260,15 +264,15 @@ ruleTester.run('no-missing-placeholders', rule, {
260264
}
261265
};
262266
`,
263-
errors: [error('hasOwnProperty')],
267+
errors: [error('hasOwnProperty', 'ObjectExpression')],
264268
},
265269
{
266270
code: `
267271
module.exports = context => {
268272
context.report(node, 'foo {{bar}}', { baz: 'qux' }); return {};
269273
};
270274
`,
271-
errors: [error('bar')],
275+
errors: [error('bar', 'ObjectExpression')],
272276
},
273277
{
274278
// Message in variable.
@@ -278,15 +282,15 @@ ruleTester.run('no-missing-placeholders', rule, {
278282
context.report(node, MESSAGE, { baz: 'qux' }); return {};
279283
};
280284
`,
281-
errors: [error('bar', 'Identifier')],
285+
errors: [error('bar', 'ObjectExpression')],
282286
},
283287
{
284288
code: `
285289
module.exports = context => {
286290
context.report(node, { line: 1, column: 3 }, 'foo {{bar}}', { baz: 'baz' }); return {};
287291
};
288292
`,
289-
errors: [error('bar')],
293+
errors: [error('bar', 'ObjectExpression')],
290294
},
291295
{
292296
code: `
@@ -300,7 +304,19 @@ ruleTester.run('no-missing-placeholders', rule, {
300304
}
301305
};
302306
`,
303-
errors: [error('bar')],
307+
errors: [
308+
error(
309+
'bar',
310+
'ObjectExpression',
311+
// report on data
312+
{
313+
line: 7,
314+
endLine: 7,
315+
column: 21,
316+
endColumn: 39,
317+
}
318+
),
319+
],
304320
},
305321

306322
{
@@ -340,7 +356,7 @@ ruleTester.run('no-missing-placeholders', rule, {
340356
}
341357
};
342358
`,
343-
errors: [error('bar')],
359+
errors: [error('bar', 'ObjectExpression')],
344360
},
345361
{
346362
// Suggestion and messageId
@@ -359,7 +375,7 @@ ruleTester.run('no-missing-placeholders', rule, {
359375
}
360376
};
361377
`,
362-
errors: [error('bar')],
378+
errors: [error('bar', 'Literal')],
363379
},
364380
{
365381
// `create` in variable.
@@ -373,7 +389,7 @@ ruleTester.run('no-missing-placeholders', rule, {
373389
}
374390
module.exports = { create };
375391
`,
376-
errors: [error('hasOwnProperty')],
392+
errors: [error('hasOwnProperty', 'ObjectExpression')],
377393
},
378394
{
379395
// messageId.
@@ -388,7 +404,19 @@ ruleTester.run('no-missing-placeholders', rule, {
388404
}
389405
};
390406
`,
391-
errors: [error('bar')],
407+
errors: [
408+
error(
409+
'bar',
410+
'Literal',
411+
// report on the messageId
412+
{
413+
line: 7,
414+
endLine: 7,
415+
column: 26,
416+
endColumn: 39,
417+
}
418+
),
419+
],
392420
},
393421
],
394422
});

0 commit comments

Comments
 (0)