From b02da12b58919b15f48e5de99d34681bf1a873a4 Mon Sep 17 00:00:00 2001
From: Ary Borenszweig <asterite@gmail.com>
Date: Fri, 13 Jul 2018 18:24:46 -0300
Subject: [PATCH] Fix: accept newline before closing macro

---
 spec/compiler/formatter/formatter_spec.cr | 2 ++
 spec/compiler/parser/parser_spec.cr       | 1 +
 src/compiler/crystal/syntax/parser.cr     | 1 +
 3 files changed, 4 insertions(+)

diff --git a/spec/compiler/formatter/formatter_spec.cr b/spec/compiler/formatter/formatter_spec.cr
index c342ad859cc0..48d6580f2508 100644
--- a/spec/compiler/formatter/formatter_spec.cr
+++ b/spec/compiler/formatter/formatter_spec.cr
@@ -1169,4 +1169,6 @@ describe Crystal::Formatter do
 
   assert_format "begin 0[1] rescue 2 end"
   assert_format "begin\n 0[1] rescue 2 end", "begin 0[1] rescue 2 end"
+
+  assert_format "{%\n  if 1\n    2\n  end\n%}"
 end
diff --git a/spec/compiler/parser/parser_spec.cr b/spec/compiler/parser/parser_spec.cr
index dc2ad1413ef9..30adb1801b45 100644
--- a/spec/compiler/parser/parser_spec.cr
+++ b/spec/compiler/parser/parser_spec.cr
@@ -781,6 +781,7 @@ module Crystal
     it_parses "{%\na = 1\n%}", MacroExpression.new(Assign.new("a".var, 1.int32), output: false)
     it_parses "{% a = 1 if 2 %}", MacroExpression.new(If.new(2.int32, Assign.new("a".var, 1.int32)), output: false)
     it_parses "{% if 1; 2; end %}", MacroExpression.new(If.new(1.int32, 2.int32), output: false)
+    it_parses "{%\nif 1; 2; end\n%}", MacroExpression.new(If.new(1.int32, 2.int32), output: false)
     it_parses "{% unless 1; 2; end %}", MacroExpression.new(If.new(1.int32, Nop.new, 2.int32), output: false)
     it_parses "{%\n1\n2\n3\n%}", MacroExpression.new(Expressions.new([1.int32, 2.int32, 3.int32] of ASTNode), output: false)
 
diff --git a/src/compiler/crystal/syntax/parser.cr b/src/compiler/crystal/syntax/parser.cr
index d93a726da6b8..6d2d509f27f0 100644
--- a/src/compiler/crystal/syntax/parser.cr
+++ b/src/compiler/crystal/syntax/parser.cr
@@ -3012,6 +3012,7 @@ module Crystal
 
       macro_control = parse_macro_control(@line_number, @column_number)
       if macro_control
+        skip_space_or_newline
         check :"%}"
         next_token_skip_space
         macro_control