Fix an edge case

Author: jackyho112

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

@@ -83,11 +83,11 @@ module.exports = {
 
           let textToReplace;
           if (parentType === 'JSXAttribute') {
-            textToReplace = expressionType === 'TemplateLiteral' ?
-              `"${expression.quasis[0].value.raw}"` :
-              `"${escapeDoubleQuotes(
+            textToReplace = `"${escapeDoubleQuotes(
+              expressionType === 'TemplateLiteral' ?
+                expression.quasis[0].value.raw :
                 expression.raw.substring(1, expression.raw.length - 1)
-              )}"`;
+            )}"`;
           } else {
             textToReplace = expressionType === 'TemplateLiteral' ?
               expression.quasis[0].value.cooked : expression.value;
@@ -122,15 +122,15 @@ module.exports = {
       if (
         expressionType === 'Literal' &&
           typeof expression.value === 'string' && (
-          !containsBackslashForEscaping(expression.raw) ||
-          parentType === 'JSXAttribute')
+          parentType === 'JSXAttribute' ||
+          !containsBackslashForEscaping(expression.raw))
       ) {
         reportUnnecessaryCurly(JSXExpressionNode);
       } else if (
         expressionType === 'TemplateLiteral' &&
           expression.expressions.length === 0 && (
-          !containsBackslashForEscaping(expression.quasis[0].value.raw) ||
-          parentType === 'JSXAttribute')
+          parentType === 'JSXAttribute' ||
+          !containsBackslashForEscaping(expression.quasis[0].value.raw))
       ) {
         reportUnnecessaryCurly(JSXExpressionNode);
       }

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

@@ -98,6 +98,10 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       code: '<MyComponent>{<App/>}{"123"}</MyComponent>',
       options: [{children: 'never'}]
     },
+    {
+      code: '<App>{\"foo \'bar\' \\\"foo\\\" bar\"}</App>',
+      options: [{children: 'never'}]
+    },
     {
       code: '<MyComponent prop={\'bar\'}>foo</MyComponent>',
       options: [{props: 'always'}]
@@ -205,6 +209,12 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       options: [{props: 'never'}],
       errors: [{message: unnecessaryCurlyMessage}]
     },
+    {
+      code: '<App prop={`foo "foo" bar`}>foo</App>',
+      output: '<App prop="foo \\\"foo\\\" bar">foo</App>',
+      options: [{props: 'never'}],
+      errors: [{message: unnecessaryCurlyMessage}]
+    },
     {
       code: '<App prop={`foo`}>foo</App>',
       output: '<App prop="foo">foo</App>',
@@ -217,6 +227,12 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       options: [{children: 'never'}],
       errors: [{message: unnecessaryCurlyMessage}]
     },
+    {
+      code: '<App>{`foo "foo" bar`}</App>',
+      output: '<App>foo "foo" bar</App>',
+      options: [{children: 'never'}],
+      errors: [{message: unnecessaryCurlyMessage}]
+    },
     {
       code: '<MyComponent>{\'foo\'}</MyComponent>',
       output: '<MyComponent>foo</MyComponent>',
@@ -257,6 +273,24 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       options: [{props: 'always'}],
       errors: [{message: missingCurlyMessage}]
     },
+    {
+      code: '<MyComponent prop=\"foo \'bar\'\">foo</MyComponent>',
+      output: '<MyComponent prop={\"foo \'bar\'\"}>foo</MyComponent>',
+      options: [{props: 'always'}],
+      errors: [{message: missingCurlyMessage}]
+    },
+    {
+      code: '<MyComponent prop=\'foo "bar"\'>foo</MyComponent>',
+      output: '<MyComponent prop={\"foo \\\"bar\\\"\"}>foo</MyComponent>',
+      options: [{props: 'always'}],
+      errors: [{message: missingCurlyMessage}]
+    },
+    {
+      code: '<MyComponent prop=\"foo \'bar\'\">foo</MyComponent>',
+      output: '<MyComponent prop={\"foo \'bar\'\"}>foo</MyComponent>',
+      options: [{props: 'always'}],
+      errors: [{message: missingCurlyMessage}]
+    },
     {
       code: '<MyComponent>foo bar </MyComponent>',
       output: '<MyComponent>{\"foo bar \"}</MyComponent>',