Consider closing ) on keyword break, closes #12206

Author: josevalim

lib/elixir/lib/code/formatter.ex

@@ -1177,6 +1177,7 @@ defmodule Code.Formatter do
               right_doc
               |> nest(2, :break)
               |> concat(break(""))
+              |> concat(")")
               |> group(:inherit)
               |> next_break_fits(:enabled)
 
@@ -1208,7 +1209,7 @@ defmodule Code.Formatter do
           if skip_parens? do
             nest(args_doc, :cursor, :break)
           else
-            nest(args_doc, 2, :break) |> concat(break(""))
+            nest(args_doc, 2, :break) |> concat(break("")) |> concat(")")
           end
 
         {args_doc, next_break_fits?, state}
@@ -1234,7 +1235,6 @@ defmodule Code.Formatter do
           |> concat(break(""))
           |> nest(2, :break)
           |> concat(args_doc)
-          |> concat(")")
           |> concat(extra)
           |> group()
       end

lib/elixir/test/elixir/calendar_test.exs

@@ -243,31 +243,49 @@ defmodule CalendarTest do
         |> elem(month - 1)
       end
 
-      assert Calendar.strftime(%{month: 1}, "%b", abbreviated_month_names: abbreviated_month_names) ==
+      assert Calendar.strftime(%{month: 1}, "%b",
+               abbreviated_month_names: abbreviated_month_names
+             ) ==
                "янв"
 
-      assert Calendar.strftime(%{month: 2}, "%b", abbreviated_month_names: abbreviated_month_names) ==
+      assert Calendar.strftime(%{month: 2}, "%b",
+               abbreviated_month_names: abbreviated_month_names
+             ) ==
                "февр"
 
-      assert Calendar.strftime(%{month: 3}, "%b", abbreviated_month_names: abbreviated_month_names) ==
+      assert Calendar.strftime(%{month: 3}, "%b",
+               abbreviated_month_names: abbreviated_month_names
+             ) ==
                "март"
 
-      assert Calendar.strftime(%{month: 4}, "%b", abbreviated_month_names: abbreviated_month_names) ==
+      assert Calendar.strftime(%{month: 4}, "%b",
+               abbreviated_month_names: abbreviated_month_names
+             ) ==
                "апр"
 
-      assert Calendar.strftime(%{month: 5}, "%b", abbreviated_month_names: abbreviated_month_names) ==
+      assert Calendar.strftime(%{month: 5}, "%b",
+               abbreviated_month_names: abbreviated_month_names
+             ) ==
                "май"
 
-      assert Calendar.strftime(%{month: 6}, "%b", abbreviated_month_names: abbreviated_month_names) ==
+      assert Calendar.strftime(%{month: 6}, "%b",
+               abbreviated_month_names: abbreviated_month_names
+             ) ==
                "июнь"
 
-      assert Calendar.strftime(%{month: 7}, "%b", abbreviated_month_names: abbreviated_month_names) ==
+      assert Calendar.strftime(%{month: 7}, "%b",
+               abbreviated_month_names: abbreviated_month_names
+             ) ==
                "июль"
 
-      assert Calendar.strftime(%{month: 8}, "%b", abbreviated_month_names: abbreviated_month_names) ==
+      assert Calendar.strftime(%{month: 8}, "%b",
+               abbreviated_month_names: abbreviated_month_names
+             ) ==
                "авг"
 
-      assert Calendar.strftime(%{month: 9}, "%b", abbreviated_month_names: abbreviated_month_names) ==
+      assert Calendar.strftime(%{month: 9}, "%b",
+               abbreviated_month_names: abbreviated_month_names
+             ) ==
                "сент"
 
       assert Calendar.strftime(%{month: 10}, "%b",

lib/elixir/test/elixir/code_formatter/integration_test.exs

@@ -383,6 +383,26 @@ defmodule Code.Formatter.IntegrationTest do
     """
   end
 
+  test "keyword list at line limit" do
+    bad = """
+    pre()
+    config(arg, foo: bar)
+    post()
+    """
+
+    good = """
+    pre()
+
+    config(arg,
+      foo: bar
+    )
+
+    post()
+    """
+
+    assert_format bad, good, line_length: 20
+  end
+
   test "do at the end of the line with single argument" do
     bad = """
     defmodule Location do

lib/elixir/test/elixir/config/reader_test.exs

@@ -59,7 +59,9 @@ defmodule Config.ReaderTest do
     assert_raise RuntimeError,
                  ~r"import_config/1 is not enabled for this configuration file",
                  fn ->
-                   Config.Reader.read!(fixture_path("configs/good_import.exs"), imports: :disabled)
+                   Config.Reader.read!(fixture_path("configs/good_import.exs"),
+                     imports: :disabled
+                   )
                  end
   end