[Fix] jsx-curly-brace-presence: allow trailing spaces in TemplateLi…

…teral
jsx-eslint · Nov 29, 2019 · 221164a · 221164a
1 parent 027ebd9
commit 221164a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/lib/rules/jsx-curly-brace-presence.js b/lib/rules/jsx-curly-brace-presence.js
@@ -174,8 +174,12 @@ module.exports = {
       return node.type && node.type === 'Literal' && node.value && jsxUtil.isWhiteSpaces(node.value);
     }
 
+    function isStringWithTrailingWhiteSpaces(value) {
+      return /^\s|\s$/.test(value);
+    }
+
     function isLiteralWithTrailingWhiteSpaces(node) {
-      return node.type && node.type === 'Literal' && node.value && /^\s|\s$/.test(node.value);
+      return node.type && node.type === 'Literal' && node.value && isStringWithTrailingWhiteSpaces(node.value);
     }
 
     // Bail out if there is any character that needs to be escaped in JSX
@@ -202,6 +206,7 @@ module.exports = {
         expressionType === 'TemplateLiteral' &&
           expression.expressions.length === 0 &&
           expression.quasis[0].value.raw.indexOf('\n') === -1 &&
+          !isStringWithTrailingWhiteSpaces(expression.quasis[0].value.raw) &&
           !needToEscapeCharacterForJSX(expression.quasis[0].value.raw) && (
           jsxUtil.isJSX(JSXExpressionNode.parent) ||
           !containsQuoteCharacters(expression.quasis[0].value.cooked)

diff --git a/tests/lib/rules/jsx-curly-brace-presence.js b/tests/lib/rules/jsx-curly-brace-presence.js
@@ -280,6 +280,14 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       code: '<MyComponent>{" space before"}</MyComponent>',
       options: ['never']
     },
+    {
+      code: '<MyComponent>{`space after `}</MyComponent>',
+      options: ['never']
+    },
+    {
+      code: '<MyComponent>{` space before`}</MyComponent>',
+      options: ['never']
+    },
     {
       code: ['<a a={"start\\', '\\', 'end"}/>'].join('/n'),
       options: ['never']
@@ -342,6 +350,17 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       parser: parsers.BABEL_ESLINT,
       options: [{children: 'never'}]
     },
+    {
+      code: `
+        <MyComponent>
+          { \`space after \` }
+          <b>foo</b>
+          { \` space before\` }
+        </MyComponent>
+      `,
+      parser: parsers.BABEL_ESLINT,
+      options: [{children: 'never'}]
+    },
     {
       code: `
         <MyComponent>