Account for when there are more than one child

Author: jackyho112

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

@@ -88,8 +88,15 @@ module.exports = {
       );
     }
 
-    function shouldCheckForUnnecessaryCurly(expressionType, parentType, config) {
-      if (expressionType !== 'Literal') {
+    function shouldCheckForUnnecessaryCurly(expressionType, parent, config) {
+      const {type: parentType} = parent;
+
+      if (
+        expressionType !== 'Literal' || (
+          parentType === 'JSXElement' &&
+          parent.children.length !== 1
+        )
+      ) {
         return false;
       }
 
@@ -110,12 +117,9 @@ module.exports = {
 
     return {
       JSXExpressionContainer: function(node) {
-        const {
-          expression: {type},
-          parent: {type: parentType}
-        } = node;
+        const {expression: {type}, parent} = node;
 
-        if (shouldCheckForUnnecessaryCurly(type, parentType, userConfig)) {
+        if (shouldCheckForUnnecessaryCurly(type, parent, userConfig)) {
           lintUnnecessaryCurly(node);
         }
       },

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

@@ -36,6 +36,9 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
     {
       code: '<App>foo</App>'
     },
+    {
+      code: '<App>{"foo"}{<Component>bar</Component>}</App>'
+    },
     {
       code: '<App prop=\'bar\'>foo</App>'
     },
@@ -59,6 +62,10 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       code: '<MyComponent>foo</MyComponent>',
       options: [{children: 'never'}]
     },
+    {
+      code: '<MyComponent>{<App/>}{"123"}</MyComponent>',
+      options: [{children: 'never'}]
+    },
     {
       code: '<MyComponent prop={\'bar\'}>foo</MyComponent>',
       options: [{props: 'always'}]