Fix formatting of lib's fun starting with uppercase letter

Fixes crystal-lang#5432
bew · Dec 21, 2017 · f5eb49d · bew · Dec 21, 2017 · f5eb49d
1 parent 7791254
commit f5eb49d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/spec/compiler/formatter/formatter_spec.cr b/spec/compiler/formatter/formatter_spec.cr
@@ -581,6 +581,8 @@ describe Crystal::Formatter do
   assert_format "lib Foo\nend"
   assert_format "lib Foo\ntype  Foo  =   Bar\nend", "lib Foo\n  type Foo = Bar\nend"
   assert_format "lib Foo\nfun foo\nend", "lib Foo\n  fun foo\nend"
+  assert_format "lib Foo\nfun Bar\nend", "lib Foo\n  fun Bar\nend"
+  assert_format "lib Foo\nfun bar = Bar\nend", "lib Foo\n  fun bar = Bar\nend"
   assert_format "lib Foo\nfun foo  :  Int32\nend", "lib Foo\n  fun foo : Int32\nend"
   assert_format "lib Foo\nfun foo()  :  Int32\nend", "lib Foo\n  fun foo : Int32\nend"
   assert_format "lib Foo\nfun foo ()  :  Int32\nend", "lib Foo\n  fun foo : Int32\nend"

diff --git a/src/compiler/crystal/tools/formatter.cr b/src/compiler/crystal/tools/formatter.cr
@@ -1530,9 +1530,13 @@ module Crystal
     def visit(node : FunDef)
       write_keyword :fun, " "
 
-      check :IDENT
-      write node.name
-      next_token_skip_space
+      case @token.type
+      when :IDENT, :CONST
+        write node.name
+        next_token_skip_space
+      else
+        raise "expecting :IDENT or :CONST, not `#{@token.type}, #{@token.value}`, at #{@token.location}"
+      end
 
       if @token.type == :"="
         write " = "