Test quoted to string

Author: josevalim

lib/elixir/lib/module/types/descr.ex

@@ -3494,8 +3494,7 @@ defmodule Module.Types.Descr do
   def map_literal_to_quoted({domains = %{}, fields}, opts) do
     domain_fields =
       for {domain_key(domain_type), value_type} <- domains do
-        key = {:string, [], ["#{domain_type}() => "]}
-        {key, to_quoted(value_type, opts)}
+        {{domain_type, [], []}, map_value_to_quoted(value_type, opts)}
       end
 
     regular_fields_quoted = map_fields_to_quoted(:closed, Enum.sort(fields), opts)
@@ -3555,13 +3554,17 @@ defmodule Module.Types.Descr do
           literal_to_quoted(key)
         end
 
-      {optional?, type} = pop_optional_static(type)
+      {key, map_value_to_quoted(type, opts)}
+    end
+  end
 
-      cond do
-        not optional? -> {key, to_quoted(type, opts)}
-        empty?(type) -> {key, {:not_set, [], []}}
-        true -> {key, {:if_set, [], [to_quoted(type, opts)]}}
-      end
+  defp map_value_to_quoted(type, opts) do
+    {optional?, type} = pop_optional_static(type)
+
+    cond do
+      not optional? -> to_quoted(type, opts)
+      empty?(type) -> {:not_set, [], []}
+      true -> {:if_set, [], [to_quoted(type, opts)]}
     end
   end
 

lib/elixir/test/elixir/module/types/descr_test.exs

@@ -2083,11 +2083,6 @@ defmodule Module.Types.DescrTest do
       assert tuple([closed_map(a: integer()), open_map()]) |> to_quoted_string() ==
                "{%{a: integer()}, map()}"
 
-      # TODO: eliminate tuple differences
-      # assert difference(tuple([number(), term()]), tuple([integer(), atom()]))
-      #        |> to_quoted_string() ==
-      #          "{float(), term()} or {number(), term() and not atom()}"
-
       assert union(tuple([integer(), atom()]), tuple([integer(), atom()])) |> to_quoted_string() ==
                "{integer(), atom()}"
 
@@ -2249,7 +2244,7 @@ defmodule Module.Types.DescrTest do
                """
     end
 
-    test "map" do
+    test "map as records" do
       assert empty_map() |> to_quoted_string() == "empty_map()"
       assert open_map() |> to_quoted_string() == "map()"
 
@@ -2367,6 +2362,14 @@ defmodule Module.Types.DescrTest do
              |> to_quoted_string() == "%{..., a: float(), b: atom(), c: port()}"
     end
 
+    test "maps as dictionaries" do
+      assert closed_map([{domain_key(:integer), integer()}])
+             |> to_quoted_string() == "%{integer() => if_set(integer())}"
+
+      assert closed_map([{domain_key(:integer), integer()}, {:float, float()}])
+             |> to_quoted_string() == "%{integer() => if_set(integer()), float: float()}"
+    end
+
     test "structs" do
       assert open_map(__struct__: atom([URI])) |> to_quoted_string() ==
                "%{..., __struct__: URI}"