fix: scaped literals double backslash formatting (#898)

packages/macro/src/macroJs.ts

@@ -8,6 +8,7 @@ import { COMMENT, ID, MESSAGE, EXTRACT_MARK } from "./constants"
 
 const keepSpaceRe = /(?:\\(?:\r\n|\r|\n))+\s+/g
 const keepNewLineRe = /(?:\r\n|\r|\n)+\s+/g
+const removeExtraScapedLiterals = /(?:\\(.))/
 
 function normalizeWhitespace(text) {
   return text.replace(keepSpaceRe, " ").replace(keepNewLineRe, "\n").trim()
@@ -269,7 +270,7 @@ export default class MacroJs {
 
           return {
             type: "text",
-            value,
+            value: this.clearBackslashes(value),
           }
         }),
         expressions: R.map((exp: babelTypes.Expression) =>
@@ -279,7 +280,6 @@ export default class MacroJs {
         ),
       }),
       (exp) => zip(exp.quasis, exp.expressions),
-      // @ts-ignore
       R.flatten,
       R.filter(Boolean)
     )
@@ -356,6 +356,13 @@ export default class MacroJs {
     }
   }
 
+  /**
+   * We clean '//\` ' to just '`'
+   */
+  clearBackslashes(value: string) {
+    return value.replace(removeExtraScapedLiterals, "`")
+  }
+
   /**
    * Custom matchers
    */

packages/macro/src/macroJsx.ts

@@ -7,6 +7,7 @@ import { zip, makeCounter } from "./utils"
 import { ID, COMMENT, MESSAGE } from "./constants"
 
 const pluralRuleRe = /(_[\d\w]+|zero|one|two|few|many|other)/
+const removeExtraScapedLiterals = /(?:\\(.))/
 const jsx2icuExactChoice = (value) =>
   value.replace(/_(\d+)/, "=$1").replace(/_(\w+)/, "$1")
 
@@ -233,7 +234,7 @@ export default class MacroJSX {
               const value = text.value.raw
               if (value === "") return null
 
-              return this.tokenizeText(value)
+              return this.tokenizeText(this.clearBackslashes(value))
             }),
             expressions: R.map((exp: babelTypes.Expression) =>
               this.types.isCallExpression(exp)
@@ -345,6 +346,13 @@ export default class MacroJSX {
     return this.types.isIdentifier(exp) ? exp.name : this.expressionIndex()
   }
 
+  /**
+   * We clean '//\` ' to just '`'
+   */
+  clearBackslashes(value: string) {
+    return value.replace(removeExtraScapedLiterals, "`")
+  }
+
   /**
    * Custom matchers
    */

packages/macro/test/js-t.ts

@@ -26,6 +26,32 @@ export default [
         })
     `,
   },
+  {
+    name: "Variables with scaped template literals are correctly formatted",
+    input: `
+        import { t } from '@lingui/macro';
+        t\`Variable \\\`\${name}\\\`\`;
+    `,
+    expected: `
+        import { i18n } from "@lingui/core";
+        /*i18n*/
+        i18n._("Variable \`{name}\`", {
+          name: name
+        })
+    `,
+  },
+  {
+    name: "Variables with scaped double quotes are correctly formatted",
+    input: `
+        import { t } from '@lingui/macro';
+        t\`Variable \"name\" \`;
+    `,
+    expected: `
+        import { i18n } from "@lingui/core";
+        /*i18n*/
+        i18n._("Variable \\"name\\"")
+    `,
+  },
   {
     name: "Variables should be deduplicated",
     input: `