Handle nested Expressions within blocks and conditional logic

spec/compiler/parser/to_s_spec.cr

@@ -434,6 +434,52 @@ describe "ASTNode#to_s" do
     end
     CR
 
+  expect_to_s <<-CR
+    {%
+      a = 1
+
+      if true
+        b = 2
+        c = 3
+      end
+
+      d = 4
+    %}
+    CR
+
+  expect_to_s <<-CR
+    {%
+      a = 1
+
+      unless false
+        b = 2
+        c = 3
+      end
+
+      d = 4
+    %}
+    CR
+
+  expect_to_s <<-CR
+    {%
+      arr.each do
+        b = 2
+        a = 1
+      end
+
+      c = 3
+    %}
+    CR
+
+  expect_to_s <<-CR
+    {%
+      arr.each do
+        b = 2
+        a = 1
+      end
+    %}
+    CR
+
   expect_to_s %(asm("nop" ::::))
   expect_to_s %(asm("nop" : "a"(1), "b"(2) : "c"(3), "d"(4) : "e", "f" : "volatile", "alignstack", "intel"))
   expect_to_s %(asm("nop" :: "c"(3), "d"(4) ::))

src/compiler/crystal/syntax/to_s.cr

@@ -294,6 +294,7 @@ module Crystal
         newline
         accept_with_indent(node.else)
       end
+      newline unless @write_trailing_newline
       append_indent
       @str << "end"
       false
@@ -1134,6 +1135,7 @@ module Crystal
       newline
       accept_with_indent(node.body)
 
+      newline unless @write_trailing_newline
       append_indent
       @str << "end"