fix(glimmer): add softline in nested block statements (#4896)

prettier · Jul 26, 2018 · 505e082 · 505e082
1 parent 9668426
commit 505e082
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 1 deletion.
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
@@ -138,7 +138,7 @@ function print(path, options, print) {
         group(
           concat([
             indent(concat([softline, path.call(print, "program")])),
-            hasParams && hasChildren ? hardline : "",
+            hasParams && hasChildren ? hardline : softline,
             printCloseBlock(path, print)
           ])
         )

diff --git a/tests/html_glimmer/__snapshots__/jsfmt.spec.js.snap b/tests/html_glimmer/__snapshots__/jsfmt.spec.js.snap
@@ -30,6 +30,22 @@ exports[`block-statement.hbs - glimmer-verify 1`] = `
   {{/block}}
 {{/block}}
 
+{{#block}}
+  {{#block param}}
+    hello
+  {{/block}}
+{{/block}}
+
+{{#block param}}
+  {{#block param}}
+    hello
+  {{/block}}
+{{/block}}
+
+{{#block}}
+  hello
+{{/block}}
+
 <MyComponent as |firstName|>
   {{firstName}}
 </MyComponent>
@@ -98,6 +114,17 @@ exports[`block-statement.hbs - glimmer-verify 1`] = `
   Hello
 {{/block}}
 {{#block}}{{#block}}hello{{/block}}{{/block}}
+{{#block}}
+  {{#block param}}
+    hello
+  {{/block}}
+{{/block}}
+{{#block param}}
+  {{#block param}}
+    hello
+  {{/block}}
+{{/block}}
+{{#block}}hello{{/block}}
 <MyComponent as |firstName|>
   {{firstName}}
 </MyComponent>

diff --git a/tests/html_glimmer/block-statement.hbs b/tests/html_glimmer/block-statement.hbs
@@ -27,6 +27,22 @@
   {{/block}}
 {{/block}}
 
+{{#block}}
+  {{#block param}}
+    hello
+  {{/block}}
+{{/block}}
+
+{{#block param}}
+  {{#block param}}
+    hello
+  {{/block}}
+{{/block}}
+
+{{#block}}
+  hello
+{{/block}}
+
 <MyComponent as |firstName|>
   {{firstName}}
 </MyComponent>