Take into account feedback

Author: jackyho112

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

@@ -64,15 +64,15 @@ module.exports = {
     }
 
     function containsHTMLEntity(rawStringValue) {
-      return rawStringValue.match(/&([A-Za-z\d]+);/g);
+      return /&([A-Za-z\d#]+);/.test(rawStringValue);
     }
 
     function containsDisallowedJSXTextChars(rawStringValue) {
-      return rawStringValue.match(/{|<|>|}/g);
+      return /[{<>}]/.test(rawStringValue);
     }
 
     function containsQuoteCharacters(value) {
-      return value.match(/'|"/g);
+      return /['"]/.test(value);
     }
 
     function escapeDoubleQuotes(rawStringValue) {
@@ -83,19 +83,17 @@ module.exports = {
       return rawStringValue.replace(/\\/g, '\\\\');
     }
 
-    function needToEscapeCharacterForJSX(raw, cooked) {
+    function needToEscapeCharacterForJSX(raw) {
       return (
         containsBackslash(raw) ||
         containsHTMLEntity(raw) ||
-        containsDisallowedJSXTextChars(raw) ||
-        containsQuoteCharacters(cooked)
+        containsDisallowedJSXTextChars(raw)
       );
     }
 
     /**
      * Report and fix an unnecessary curly brace violation on a node
      * @param {ASTNode} node - The AST node with an unnecessary JSX expression
-     * @param {String} text - The text to replace the unnecessary JSX expression
      */
     function reportUnnecessaryCurly(JSXExpressionNode) {
       context.report({
@@ -150,19 +148,24 @@ module.exports = {
     function lintUnnecessaryCurly(JSXExpressionNode) {
       const expression = JSXExpressionNode.expression;
       const expressionType = expression.type;
+      const parentType = JSXExpressionNode.parent.type;
 
       if (
         expressionType === 'Literal' &&
           typeof expression.value === 'string' &&
-          !needToEscapeCharacterForJSX(expression.raw, expression.value)
+          !needToEscapeCharacterForJSX(expression.raw) && (
+          parentType === 'JSXElement' ||
+          !containsQuoteCharacters(expression.value)
+        )
       ) {
         reportUnnecessaryCurly(JSXExpressionNode);
       } else if (
         expressionType === 'TemplateLiteral' &&
           expression.expressions.length === 0 &&
-          !needToEscapeCharacterForJSX(
-            expression.quasis[0].value.raw, expression.quasis[0].value.cooked
-          )
+          !needToEscapeCharacterForJSX(expression.quasis[0].value.raw) && (
+          parentType === 'JSXElement' ||
+          !containsQuoteCharacters(expression.quasis[0].value.cooked)
+        )
       ) {
         reportUnnecessaryCurly(JSXExpressionNode);
       }