Formatter: fix removal of newline when it had spaces

crystal-lang · Jun 3, 2017 · 0c3c3d4 · 0c3c3d4
1 parent ddc3cb3
commit 0c3c3d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/spec/compiler/formatter/formatter_spec.cr b/spec/compiler/formatter/formatter_spec.cr
@@ -1020,4 +1020,6 @@ describe Crystal::Formatter do
   assert_format "def a\n  b(\n    1, # x\n    # y\n    a: 1, # x\n    # y\n    b: 2 # z\n  )\nend"
 
   assert_format "def foo(a, **b : Int32)\nend"
+
+  assert_format "foo\n  \nbar", "foo\n\nbar"
 end
diff --git a/src/compiler/crystal/tools/formatter.cr b/src/compiler/crystal/tools/formatter.cr
@@ -4139,7 +4139,7 @@ module Crystal
     def consume_newlines
       if @token.type == :NEWLINE
         write_line
-        next_token
+        next_token_skip_space
 
         if @token.type == :NEWLINE
           write_line
@@ -4210,6 +4210,7 @@ module Crystal
       else
         @column += string.size
       end
+
       @wrote_newline = false
       @last_write = string
     end