Keep keyword format of tuple last element (#11354)

Author: doorgan

lib/elixir/lib/code/normalizer.ex

@@ -182,6 +182,20 @@ defmodule Code.Normalizer do
     end
   end
 
+  # Tuples
+  defp do_normalize({:{}, meta, args} = quoted, state) do
+    {last_arg, args} = List.pop_at(args, -1)
+
+    with [{{:__block__, key_meta, _}, _} | _] <- last_arg, :keyword <- key_meta[:format] do
+      args = normalize_kw_args(args, state)
+      kw_list = normalize_kw_args(last_arg, state)
+      {:{}, meta, args ++ kw_list}
+    else
+      _ ->
+        normalize_call(quoted, state)
+    end
+  end
+
   # Calls
   defp do_normalize({_, _, args} = quoted, state) when is_list(args) do
     normalize_call(quoted, state)
@@ -231,7 +245,13 @@ defmodule Code.Normalizer do
   defp normalize_literal({left, right}, meta, state) do
     meta = patch_meta_line(meta, state.parent_meta)
     state = %{state | parent_meta: meta}
-    {:__block__, meta, [{do_normalize(left, state), do_normalize(right, state)}]}
+
+    with [{{:__block__, key_meta, _}, _} | _] <- right, :keyword <- key_meta[:format] do
+      {:__block__, meta, [{do_normalize(left, state), normalize_kw_args(right, state)}]}
+    else
+      _ ->
+        {:__block__, meta, [{do_normalize(left, state), do_normalize(right, state)}]}
+    end
   end
 
   # Lists

lib/elixir/test/elixir/code_normalizer/formatted_ast_test.exs

@@ -342,6 +342,13 @@ defmodule Code.Normalizer.FormatterASTTest do
       @type foo :: a when b: :c
       """
     end
+
+    test "last tuple element as keyword list keeps its format" do
+      assert_same ~S"{:wrapped, [opt1: true, opt2: false]}"
+      assert_same ~S"{:unwrapped, opt1: true, opt2: false}"
+      assert_same ~S"{:wrapped, 1, [opt1: true, opt2: false]}"
+      assert_same ~S"{:unwrapped, 1, opt1: true, opt2: false}"
+    end
   end
 
   describe "preserves user choice on parenthesis" do