fix(html): treat CRLF as LF (#5393)

prettier · Nov 9, 2018 · 12a8fa3 · 12a8fa3
1 parent 423ddf9
commit 12a8fa3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 15 deletions.
diff --git a/src/language-html/parser-html.js b/src/language-html/parser-html.js
@@ -281,6 +281,7 @@ function locEnd(node) {
 
 function createParser({ recognizeSelfClosing }) {
   return {
+    preprocess: text => text.replace(/\r\n?/g, "\n"),
     parse: (text, parsers, options) =>
       _parse(text, options, recognizeSelfClosing),
     hasPragma,

diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
@@ -446,20 +446,25 @@ function printChildren(path, options, print) {
       return print(childPath);
     }
     const child = childPath.getValue();
-    return concat([
-      printOpeningTagPrefix(child),
-      options.originalText.slice(
-        options.locStart(child) +
-          (child.prev && needsToBorrowNextOpeningTagStartMarker(child.prev)
-            ? printOpeningTagStartMarker(child).length
-            : 0),
-        options.locEnd(child) -
-          (child.next && needsToBorrowPrevClosingTagEndMarker(child.next)
-            ? printClosingTagEndMarker(child).length
-            : 0),
+    return concat(
+      [].concat(
+        printOpeningTagPrefix(child),
+        replaceNewlines(
+          options.originalText.slice(
+            options.locStart(child) +
+              (child.prev && needsToBorrowNextOpeningTagStartMarker(child.prev)
+                ? printOpeningTagStartMarker(child).length
+                : 0),
+            options.locEnd(child) -
+              (child.next && needsToBorrowPrevClosingTagEndMarker(child.next)
+                ? printClosingTagEndMarker(child).length
+                : 0)
+          ),
+          literalline
+        ),
         printClosingTagSuffix(child)
       )
-    ]);
+    );
   }
 
   function printBetweenLine(prevNode, nextNode) {
@@ -548,9 +553,14 @@ function printOpeningTag(path, options, print) {
                   return path.map(attrPath => {
                     const attr = attrPath.getValue();
                     return hasPrettierIgnoreAttribute(attr)
-                      ? options.originalText.slice(
-                          options.locStart(attr),
-                          options.locEnd(attr)
+                      ? concat(
+                          replaceNewlines(
+                            options.originalText.slice(
+                              options.locStart(attr),
+                              options.locEnd(attr)
+                            ),
+                            literalline
+                          )
                         )
                       : print(attrPath);
                   }, "attrs");

diff --git a/tests_integration/__tests__/__snapshots__/format.js.snap b/tests_integration/__tests__/__snapshots__/format.js.snap
@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`html parser should handle CRLF correctly 1`] = `"\\"<!--\\\\r\\\\n  test\\\\r\\\\n  test\\\\r\\\\n-->\\\\r\\\\n\\""`;
+
 exports[`typescript parser should throw the first error when both JSX and non-JSX mode failed 1`] = `
 "Expression expected. (9:7)
    7 | );

diff --git a/tests_integration/__tests__/format.js b/tests_integration/__tests__/format.js
@@ -25,3 +25,11 @@ label:
     prettier.format(input, { parser: "typescript" })
   ).toThrowErrorMatchingSnapshot();
 });
+
+test("html parser should handle CRLF correctly", () => {
+  const input = "<!--\r\n  test\r\n  test\r\n-->";
+  expect(
+    // use JSON.stringify to observe CRLF
+    JSON.stringify(prettier.format(input, { parser: "html" }))
+  ).toMatchSnapshot();
+});