fix(css-in-js): do not remove semicolon (#5353)

src/language-css/parser-postcss.js

@@ -556,7 +556,7 @@ const parser = {
     if (endNode && node.source && !node.source.end) {
       node = endNode;
     }
-    if (node.source) {
+    if (node.source && node.source.end) {
       return lineColumnToIndex(node.source.end, node.source.input.css);
     }
     return null;

src/language-css/printer-postcss.js

@@ -185,7 +185,9 @@ function genericPrint(path, options, print) {
               softline,
               "}"
             ])
-          : isTemplatePropNode(node) && !parentNode.raws.semicolon
+          : isTemplatePropNode(node) &&
+            !parentNode.raws.semicolon &&
+            options.originalText[options.locEnd(node) - 1] !== ";"
             ? ""
             : ";"
       ]);
@@ -242,7 +244,9 @@ function genericPrint(path, options, print) {
               softline,
               "}"
             ])
-          : isTemplatePlaceholderNode(node) && !parentNode.raws.semicolon
+          : isTemplatePlaceholderNode(node) &&
+            !parentNode.raws.semicolon &&
+            options.originalText[options.locEnd(node) - 1] !== ";"
             ? ""
             : ";"
       ]);

tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap

@@ -130,7 +130,17 @@ styled.span\`
 styled.span\`
 \${foo}:
 \${bar};
-\`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+\`
+
+styled.a\`
+  \${feedbackCountBlockCss}
+  text-decoration: none;
+
+  \${FeedbackCount} {
+    margin: 0;
+  }
+\`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 const ListItem = styled.li\`\`;
 
 const ListItem = styled.li\`\`;
@@ -263,4 +273,13 @@ styled.span\`
   \${foo}: \${bar};
 \`;
 
+styled.a\`
+  \${feedbackCountBlockCss}
+  text-decoration: none;
+
+  \${FeedbackCount} {
+    margin: 0;
+  }
+\`;
+
 `;

tests/multiparser_js_css/styled-components.js

@@ -127,4 +127,13 @@ ${bar}
 styled.span`
 ${foo}:
 ${bar};
-`
+`
+
+styled.a`
+  ${feedbackCountBlockCss}
+  text-decoration: none;
+
+  ${FeedbackCount} {
+    margin: 0;
+  }
+`