Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix] jsx-curly-brace-presence: allow trailing spaces in TemplateLiteral #2507

Merged
merged 1 commit into from Nov 30, 2019
Merged

[fix] jsx-curly-brace-presence: allow trailing spaces in TemplateLiteral #2507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/rules/jsx-curly-brace-presence.js
View file
Open in desktop
Expand Up @@ -174,8 +174,12 @@ module.exports = {
return node.type && node.type === 'Literal' && node.value && jsxUtil.isWhiteSpaces(node.value);
}

function isStringWithTrailingWhiteSpaces(value) {
return /^\s|\s$/.test(value);
}

function isLiteralWithTrailingWhiteSpaces(node) {
return node.type && node.type === 'Literal' && node.value && /^\s|\s$/.test(node.value);
return node.type && node.type === 'Literal' && node.value && isStringWithTrailingWhiteSpaces(node.value);
}

// Bail out if there is any character that needs to be escaped in JSX
Expand All @@ -202,6 +206,7 @@ module.exports = {
expressionType === 'TemplateLiteral' &&
expression.expressions.length === 0 &&
expression.quasis[0].value.raw.indexOf('\n') === -1 &&
!isStringWithTrailingWhiteSpaces(expression.quasis[0].value.raw) &&
!needToEscapeCharacterForJSX(expression.quasis[0].value.raw) && (
jsxUtil.isJSX(JSXExpressionNode.parent) ||
!containsQuoteCharacters(expression.quasis[0].value.cooked)
Expand Down
19 changes: 19 additions & 0 deletions tests/lib/rules/jsx-curly-brace-presence.js
View file
Open in desktop
Expand Up @@ -280,6 +280,14 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
code: '<MyComponent>{" space before"}</MyComponent>',
options: ['never']
},
{
code: '<MyComponent>{`space after `}</MyComponent>',
options: ['never']
},
{
code: '<MyComponent>{` space before`}</MyComponent>',
options: ['never']
},
{
code: ['<a a={"start\\', '\\', 'end"}/>'].join('/n'),
options: ['never']
Expand Down Expand Up @@ -342,6 +350,17 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
parser: parsers.BABEL_ESLINT,
options: [{children: 'never'}]
},
{
code: `
<MyComponent>
{ \`space after \` }
<b>foo</b>
{ \` space before\` }
</MyComponent>
`,
parser: parsers.BABEL_ESLINT,
options: [{children: 'never'}]
},
{
code: `
<MyComponent>
Expand Down