Fixed #2857: Formatter shouldn't reformat { {{FOO}}, nil}

crystal-lang · Jun 16, 2016 · 8b0ea3d · 8b0ea3d
1 parent 65500f6
commit 8b0ea3d
Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/spec/compiler/formatter/formatter_spec.cr b/spec/compiler/formatter/formatter_spec.cr
@@ -924,4 +924,7 @@ describe Crystal::Formatter do
   assert_format %(x : {"foo bar": Int32})
 
   assert_format %(def foo("bar baz" qux)\nend)
+  assert_format "{ {{FOO}}, nil}", "{ {{FOO}}, nil }"
+  assert_format "{ {% begin %}1{% end %}, nil }"
+  assert_format "{ {% for x in 1..2 %}3{% end %}, nil }"
 end
diff --git a/src/compiler/crystal/tools/formatter.cr b/src/compiler/crystal/tools/formatter.cr
@@ -674,7 +674,14 @@ module Crystal
           current_element = current_element.key
         end
 
-        if prefix == :"{" && i == 0 && !wrote_newline && (current_element.is_a?(TupleLiteral) || current_element.is_a?(NamedTupleLiteral) || current_element.is_a?(HashLiteral))
+        if prefix == :"{" && i == 0 && !wrote_newline && (
+             current_element.is_a?(TupleLiteral) ||
+             current_element.is_a?(NamedTupleLiteral) ||
+             current_element.is_a?(HashLiteral) ||
+             current_element.is_a?(MacroExpression) ||
+             current_element.is_a?(MacroIf) ||
+             current_element.is_a?(MacroFor)
+           )
           write " "
           write_space_at_end = true
         end