Merge branch 'release/0.18'

crystal-lang · Jun 30, 2016 · b34aed4 · b34aed4
2 parents 2260d07 + daa874a
commit b34aed4
Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/spec/compiler/formatter/formatter_spec.cr b/spec/compiler/formatter/formatter_spec.cr
@@ -465,6 +465,7 @@ describe Crystal::Formatter do
   assert_format "begin\n1\nrescue   Int32 \n3\nend", "begin\n  1\nrescue Int32\n  3\nend"
   assert_format "if 1\nbegin\n2\nensure\n3\nend\nend", "if 1\n  begin\n    2\n  ensure\n    3\n  end\nend"
   assert_format "1 rescue 2"
+  assert_format "1 ensure 2"
 
   assert_format "def foo\n1\nrescue\n2\nend", "def foo\n  1\nrescue\n  2\nend"
   assert_format "def foo\n1\nensure\n2\nend", "def foo\n  1\nensure\n  2\nend"

diff --git a/src/compiler/crystal/syntax/parser.cr b/src/compiler/crystal/syntax/parser.cr
@@ -261,9 +261,9 @@ module Crystal
             next_token_skip_space
             ensure_body = parse_expression
             if atomic.is_a?(Assign)
-              atomic.value = ExceptionHandler.new(atomic.value, ensure: ensure_body).at(location)
+              atomic.value = ExceptionHandler.new(atomic.value, ensure: ensure_body).at(location).tap { |e| e.suffix = true }
             else
-              atomic = ExceptionHandler.new(atomic, ensure: ensure_body).at(location)
+              atomic = ExceptionHandler.new(atomic, ensure: ensure_body).at(location).tap { |e| e.suffix = true }
             end
           when :ifdef
             next_token_skip_statement_end

diff --git a/src/compiler/crystal/tools/formatter.cr b/src/compiler/crystal/tools/formatter.cr
@@ -3304,9 +3304,20 @@ module Crystal
         if node.suffix
           accept node.body
           skip_space
-          write " rescue "
-          next_token_skip_space_or_newline
-          accept node.rescues.not_nil!.first.not_nil!.body
+          write " "
+          if @token.keyword?(:rescue)
+            write_keyword :rescue
+            write " "
+            next_token_skip_space_or_newline
+            accept node.rescues.not_nil!.first.not_nil!.body
+          elsif @token.keyword?(:ensure)
+            write_keyword :ensure
+            write " "
+            next_token_skip_space_or_newline
+            accept node.ensure.not_nil!
+          else
+            raise "expected 'rescue' or 'ensure'"
+          end
           return false
         end
       end