Merge branch 'release/0.17'

crystal-lang · May 25, 2016 · 3d13b18 · 3d13b18
2 parents 97a7216 + 97b968b
commit 3d13b18
Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/spec/compiler/formatter/formatter_spec.cr b/spec/compiler/formatter/formatter_spec.cr
@@ -907,4 +907,6 @@ describe Crystal::Formatter do
   assert_format "foo { | a, ( b , c ) | a + b + c }", "foo { |a, (b, c)| a + b + c }"
   assert_format "foo { | a, ( b , c, ), | a + b + c }", "foo { |a, (b, c)| a + b + c }"
   assert_format "foo { | a, ( _ , c ) | a + c }", "foo { |a, (_, c)| a + c }"
+
+  assert_format "def foo\n  {{@type}}\nend"
 end
diff --git a/src/compiler/crystal/tools/formatter.cr b/src/compiler/crystal/tools/formatter.cr
@@ -1202,7 +1202,11 @@ module Crystal
       @inside_def += 1
 
       write_keyword :abstract, " " if node.abstract?
-      write_keyword :macro, " " if node.macro_def?
+
+      if node.macro_def? && @token.keyword?(:macro)
+        write_keyword :macro, " "
+      end
+
       write_keyword :def, " ", skip_space_or_newline: false
 
       if receiver = node.receiver