Formatter should not fail on empty clauses, closes #6924

2 files changed, 27 insertions, 1 deletions

diff --git a/lib/elixir/test/elixir/code_formatter/integration_test.exs b/lib/elixir/test/elixir/code_formatter/integration_test.exs
index e16d49eb9..a3be10903 100644
--- a/lib/elixir/test/elixir/code_formatter/integration_test.exs
+++ b/lib/elixir/test/elixir/code_formatter/integration_test.exs
@@ -301,4 +301,30 @@ defmodule Code.Formatter.IntegrationTest do
     end
     """
   end
+
+  test "case with empty clause" do
+    ExUnit.CaptureIO.capture_io(:stderr, fn ->
+      bad = """
+      def hello(world) do
+        case world do
+          :world -> IO.inspect world
+
+          _ ->
+        end
+      end
+      """
+
+      assert_format bad, """
+      def hello(world) do
+        case world do
+          :world ->
+            IO.inspect(world)
+
+          _ ->
+            nil
+        end
+      end
+      """
+    end)
+  end
 end
diff --git a/lib/elixir/test/elixir/code_formatter/operators_test.exs b/lib/elixir/test/elixir/code_formatter/operators_test.exs
index 432162fc5..2d995fd15 100644
--- a/lib/elixir/test/elixir/code_formatter/operators_test.exs
+++ b/lib/elixir/test/elixir/code_formatter/operators_test.exs
@@ -734,7 +734,7 @@ defmodule Code.Formatter.OperatorsTest do
       assert_format bad, good, @short_length
     end
 
-    test "with do end blocks" do
+    test "with do-end blocks" do
       attribute = """
       @doc do
         :ok