Merge pull request #145 from Shopify/fix/issue-144

Fix trailing whitespace after opening raw tag breaking formatting

Author: charlespwd

src/printer/printer-liquid-html.ts

@@ -254,9 +254,13 @@ function printNode(
       }
 
       const lines = bodyLines(node.value);
-      const shouldSkipFirstLine =
-        !node.source[node.position.start].match(/\r|\n/);
-      return lines.length > 0 && lines[0].trim() !== ''
+
+      const rawFirstLineIsntIndented = !!node.value
+        .split(/\r?\n/)[0]
+        ?.match(/\S/);
+      const shouldSkipFirstLine = rawFirstLineIsntIndented;
+
+      return lines.length > 0 && lines.find((line) => line.trim() !== '')
         ? join(hardline, reindent(lines, shouldSkipFirstLine))
         : softline;
     }

src/printer/utils/string.ts

@@ -10,7 +10,7 @@ export const trimEnd = (x: string) => x.trimEnd();
 
 export function bodyLines(str: string): string[] {
   return str
-    .replace(/^\n*|\s*$/g, '') // only want the meat
+    .replace(/^(?: |\t)*(\r?\n)*|\s*$/g, '') // only want the meat
     .split(/\r?\n/);
 }
 

test/issue-144/fixed.liquid

@@ -0,0 +1,5 @@
+it should format as expected when there's whitespace after the opening comment
+{% comment %}
+  This is a comment
+{% endcomment %}
+<p>hello, world!</p>

test/issue-144/index.liquid

@@ -0,0 +1,5 @@
+it should format as expected when there's whitespace after the opening comment
+{% comment %} 
+This is a comment
+{% endcomment %}
+<p>hello, world!</p>

test/issue-144/index.spec.ts

@@ -0,0 +1,6 @@
+import { assertFormattedEqualsFixed } from '../test-helpers';
+import * as path from 'path';
+
+describe(`Unit: ${path.basename(__dirname)}`, () => {
+  assertFormattedEqualsFixed(__dirname);
+});