Skip to content

Commit 4377ed1

Browse files
committed
[refactor]jsx-curly-brace-presence: function hasAdjacentJsxExpressionContainers & tests
1 parent 465ea48 commit 4377ed1

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

lib/rules/jsx-curly-brace-presence.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,7 @@ module.exports = {
229229
const childrenExcludingWhitespaceLiteral = children.filter(child => !isWhiteSpaceLiteral(child));
230230
const adjSiblings = getAdjacentSiblings(node, childrenExcludingWhitespaceLiteral);
231231

232-
for (let i = 0; i < adjSiblings.length; i++) {
233-
const currentChild = adjSiblings[i];
234-
if (currentChild.type && currentChild.type === 'JSXExpressionContainer') {
235-
return true;
236-
}
237-
}
238-
return false;
232+
return adjSiblings.some(x => x.type && x.type === 'JSXExpressionContainer');
239233
}
240234

241235
function shouldCheckForUnnecessaryCurly(parent, node, config) {

tests/lib/rules/jsx-curly-brace-presence.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,11 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
390390
`,
391391
parser: parsers.BABEL_ESLINT,
392392
options: [{children: 'never'}],
393-
errors: 3
393+
errors: [
394+
{message: unnecessaryCurlyMessage},
395+
{message: unnecessaryCurlyMessage},
396+
{message: unnecessaryCurlyMessage}
397+
]
394398
},
395399
{
396400
code: `
@@ -415,7 +419,7 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
415419
`,
416420
parser: parsers.BABEL_ESLINT,
417421
options: [{children: 'never'}],
418-
errors: 2
422+
errors: [{message: unnecessaryCurlyMessage}, {message: unnecessaryCurlyMessage}]
419423
},
420424
{
421425
code: `<MyComponent prop='bar'>foo</MyComponent>`,

0 commit comments

Comments
 (0)