diff --git a/src/language-js/embed.js b/src/language-js/embed.js index 04fc769c..864485c7 100644 --- 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 index 3a93d54f..a4a0b1fe 100644 --- 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 index ddd68baa..be5e58e0 100644 --- 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; + } +`