fix: correct prettier placeholder regex (#4302)

prettier · Apr 12, 2018 · 47cb5ad · 47cb5ad
1 parent bdc5e00
commit 47cb5ad
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/language-js/embed.js b/src/language-js/embed.js
@@ -283,7 +283,7 @@ function replacePlaceholders(quasisDoc, expressionDocs) {
       const placeholder = parts[atPlaceholderIndex];
       const rest = parts.slice(atPlaceholderIndex + 1);
       const placeholderMatch = placeholder.match(
-        /@prettier-placeholder-(.+)-id(.*)/
+        /@prettier-placeholder-(.+)-id([\s\S]*)/
       );
       const placeholderID = placeholderMatch[1];
       // When the expression has a suffix appended, like:

diff --git a/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap
@@ -66,6 +66,13 @@ styled.div\`
   \${props => props.red ? 'color: red;' : ''};
   /* prettier-ignore */
 \`
+
+styled.div\`
+ \${sanitize} \${fonts}
+  html {
+    margin: 0;
+  }
+\`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 const ListItem = styled.li\`\`;
 
@@ -136,4 +143,11 @@ styled.div\`
   /* prettier-ignore */
 \`;
 
+styled.div\`
+  \${sanitize} \${fonts}
+  html {
+    margin: 0;
+  }
+\`;
+
 `;
diff --git a/tests/multiparser_js_css/styled-components.js b/tests/multiparser_js_css/styled-components.js
@@ -63,3 +63,10 @@ styled.div`
   ${props => props.red ? 'color: red;' : ''};
   /* prettier-ignore */
 `
+
+styled.div`
+ ${sanitize} ${fonts}
+  html {
+    margin: 0;
+  }
+`