Skip to content

Commit 4c1f66a

Browse files
committed
Revert "[Fix] jsx-curly-brace-presence: handle single and only expression template literals"
This reverts commit 099b14c.
1 parent 1a3a17a commit 4c1f66a

File tree

2 files changed

+0
-30
lines changed

2 files changed

+0
-30
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ module.exports = {
131131
return containsLineTerminators(text) && text.trim() === '';
132132
}
133133

134-
function isSingleExpressionTemplateLiteral(child) {
135-
return child.type === 'TemplateLiteral' && child.expressions.length === 1 && child.quasis.map((quasis) => quasis.value.raw).join('') === '';
136-
}
137-
138134
function wrapNonHTMLEntities(text) {
139135
const HTML_ENTITY = '<HTML_ENTITY>';
140136
const withCurlyBraces = text.split(HTML_ENTITY_REGEX()).map((word) => (
@@ -181,9 +177,6 @@ module.exports = {
181177
if (jsxUtil.isJSX(expression)) {
182178
const sourceCode = context.getSourceCode();
183179
textToReplace = sourceCode.getText(expression);
184-
} else if (isSingleExpressionTemplateLiteral(expression)) {
185-
const sourceCode = context.getSourceCode();
186-
textToReplace = `{${sourceCode.getText(expression.expressions[0])}}`;
187180
} else {
188181
const expressionType = expression && expression.type;
189182
const parentType = JSXExpressionNode.parent.type;
@@ -286,9 +279,6 @@ module.exports = {
286279
&& !containsQuoteCharacters(expression.quasis[0].value.cooked)
287280
) {
288281
reportUnnecessaryCurly(JSXExpressionNode);
289-
} else if (
290-
isSingleExpressionTemplateLiteral(expression)) {
291-
reportUnnecessaryCurly(JSXExpressionNode);
292282
} else if (jsxUtil.isJSX(expression)) {
293283
reportUnnecessaryCurly(JSXExpressionNode);
294284
}

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -468,14 +468,6 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
468468
`,
469469
features: ['no-ts'],
470470
options: ['never'],
471-
},
472-
{
473-
code: '<App label={`${label}${suffix}`} />',
474-
options: [{ props: 'never' }],
475-
},
476-
{
477-
code: '<App>{`${label}${suffix}`}</App>',
478-
options: [{ children: 'never' }],
479471
}
480472
)),
481473

@@ -939,18 +931,6 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
939931
errors: [{ messageId: 'unnecessaryCurly' }],
940932
options: [{ props: 'never', children: 'never', propElementValues: 'never' }],
941933
features: ['no-ts'],
942-
},
943-
{
944-
code: '<App label={`${label}`} />',
945-
output: '<App label={label} />',
946-
errors: [{ messageId: 'unnecessaryCurly' }],
947-
options: [{ props: 'never', children: 'never', propElementValues: 'never' }],
948-
},
949-
{
950-
code: '<App>{`${label}`}</App>',
951-
output: '<App>{label}</App>',
952-
errors: [{ messageId: 'unnecessaryCurly' }],
953-
options: [{ props: 'never', children: 'never', propElementValues: 'never' }],
954934
}
955935
)),
956936
});

0 commit comments

Comments
 (0)