[jsx curly brace presence]: fix jsx tags in braces

jsx-eslint · Sep 28, 2019 · fd09319 · fd09319
1 parent 4a05fa2
commit fd09319
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/rules/jsx-curly-brace-presence.js b/lib/rules/jsx-curly-brace-presence.js
@@ -128,6 +128,10 @@ module.exports = {
               expression.quasis[0].value.raw :
               expression.raw.substring(1, expression.raw.length - 1)
             }"`;
+          } else if (jsxUtil.isJSX(expression)) {
+            const sourceCode = context.getSourceCode();
+
+            textToReplace = sourceCode.getText(expression);
           } else {
             textToReplace = expressionType === 'TemplateLiteral' ?
               expression.quasis[0].value.cooked : expression.value;
@@ -190,6 +194,8 @@ module.exports = {
         )
       ) {
         reportUnnecessaryCurly(JSXExpressionNode);
+      } else if (jsxUtil.isJSX(expression)) {
+        reportUnnecessaryCurly(JSXExpressionNode);
       }
     }
 

diff --git a/tests/lib/rules/jsx-curly-brace-presence.js b/tests/lib/rules/jsx-curly-brace-presence.js
@@ -96,7 +96,8 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       options: [{props: 'never'}]
     },
     {
-      code: '<App>{<myApp></myApp>}</App>'
+      code: '<App>{<myApp></myApp>}</App>',
+      options: [{children: 'always'}]
     },
     {
       code: '<App>{[]}</App>'
@@ -313,6 +314,17 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       options: [{props: 'never'}],
       errors: [{message: unnecessaryCurlyMessage}]
     },
+    {
+      code: '<App>{<myApp></myApp>}</App>',
+      output: '<App><myApp></myApp></App>',
+      options: [{children: 'never'}],
+      errors: [{message: unnecessaryCurlyMessage}]
+    },
+    {
+      code: '<App>{<myApp></myApp>}</App>',
+      output: '<App><myApp></myApp></App>',
+      errors: [{message: unnecessaryCurlyMessage}]
+    },
     {
       code: '<App prop={`foo`}>foo</App>',
       output: '<App prop="foo">foo</App>',