fix: improve fixer to cover more cases

eslint · Nov 7, 2021 · a0a5763 · a0a5763
1 parent 054ae63
commit a0a5763
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/rules/prefer-template.js b/lib/rules/prefer-template.js
@@ -204,12 +204,21 @@ module.exports = {
                 const currentNodeText = sourceCode.getText(currentNode);
 
                 if (currentNode === currentNode.parent.left) {
+                    if (isConcatenation(currentNode.right)) {
+                        const openingParentesisSign = sourceCode.getFirstTokenBetween(currentNode.left, currentNode.right, token => token.value === "(");
+                        const leftNodeText = currentNodeText.slice(0, openingParentesisSign.range[0] - firstToken.range[0]);
+
+                        return `${leftNodeText}${currentNode.right.left.raw} + \`${escapeTemplatePlaceholders(currentNode.right.right.raw)}'`;
+                    }
+
                     const leftNodeText = currentNodeText.slice(0, currentNode.right.range[0] - firstToken.range[0]);
 
                     return `${leftNodeText}\`${escapeTemplatePlaceholders(currentNode.right.raw)}'`;
                 }
 
-                if (currentNode.parent.left.right ? hasNonStringLiteral(currentNode.parent.left.right) : hasNonStringLiteral(currentNode.parent.left)) {
+                const nodeBeforeCurrentNode = currentNode.parent.left.right || currentNode.parent.left;
+
+                if (hasNonStringLiteral(nodeBeforeCurrentNode)) {
                     return `\\${escapeTemplatePlaceholders(firstToken.value)}\`${currentNodeText.slice(firstToken.value.length)}`;
                 }
 

diff --git a/tests/lib/rules/prefer-template.js b/tests/lib/rules/prefer-template.js
@@ -340,6 +340,16 @@ ruleTester.run("prefer-template", rule, {
             output: "`${foo  }\\`a\\`${  bar  }\\`b\\`` + `\\`c\\`${  test}`",
             errors
         },
+        {
+            code: "'a' + ('b' + 'c') + d",
+            output: "'a' + 'b' + `c${  d}`",
+            errors
+        },
+        {
+            code: "'a' + ('`b`' + '`c`') + d",
+            output: "'a' + '`b`' + `\\`c\\`${  d}`",
+            errors
+        },
         {
             code: "var foo = \"Hello \" + \"world \" + \"another \" + test",
             output: "var foo = \"Hello \" + \"world \" + `another ${  test}`",