Merge branch 'egil/fix-maps-type-pretty-print/OTP-12190' into maint

* egil/fix-maps-type-pretty-print/OTP-12190:
  edoc, erl_docgen: Enhance internal map type format
  stdlib: Fix maps type pretty printing

4 files changed, 23 insertions, 21 deletions

diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index f4e78e8f3a..a102d432bc 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -831,8 +831,6 @@ t_type([#xmlElement{name = nonempty_list, content = Es}]) ->
     t_nonempty_list(Es);
 t_type([#xmlElement{name = map, content = Es}]) ->
     t_map(Es);
-t_type([#xmlElement{name = map_field, content=Es}]) ->
-    t_map_field(Es);
 t_type([#xmlElement{name = tuple, content = Es}]) ->
     t_tuple(Es);
 t_type([#xmlElement{name = 'fun', content = Es}]) ->
@@ -882,9 +880,10 @@ t_fun(Es) ->
 		 [") -> "] ++ t_utype(get_elem(type, Es))).
 
 t_map(Es) ->
-    ["#{"] ++ seq(fun t_utype_elem/1, Es, ["}"]).
+    Fs = get_elem(map_field, Es),
+    ["#{"] ++ seq(fun t_map_field/1, Fs, ["}"]).
 
-t_map_field([K,V]) ->
+t_map_field(#xmlElement{content = [K,V]}) ->
     t_utype_elem(K) ++ [" => "] ++ t_utype_elem(V).
 
 t_record(E, Es) ->
@@ -1084,8 +1083,6 @@ ot_type([#xmlElement{name = tuple, content = Es}]) ->
     ot_tuple(Es);
 ot_type([#xmlElement{name = map, content = Es}]) ->
     ot_map(Es);
-ot_type([#xmlElement{name = map_field, content = Es}]) ->
-    ot_map_field(Es);
 ot_type([#xmlElement{name = 'fun', content = Es}]) ->
     ot_fun(Es);
 ot_type([#xmlElement{name = record, content = Es}]) ->
@@ -1143,10 +1140,10 @@ ot_tuple(Es) ->
     {type,0,tuple,[ot_utype_elem(E) || E <- Es]}.
 
 ot_map(Es) ->
-    {type,0,map,[ot_utype_elem(E) || E <- Es]}.
+    {type,0,map,[ot_map_field(E) || E <- get_elem(map_field,Es)]}.
 
-ot_map_field(Es) ->
-    {type,0,map_field_assoc,[ot_utype_elem(E) || E <- Es]}.
+ot_map_field(#xmlElement{content=[K,V]}) ->
+    {type,0,map_field_assoc,ot_utype_elem(K), ot_utype_elem(V)}.
 
 ot_fun(Es) ->
     Range = ot_utype(get_elem(type, Es)),
diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl
index d4e00d3ecd..8a6c8eb33e 100644
--- a/lib/edoc/src/edoc_types.erl
+++ b/lib/edoc/src/edoc_types.erl
@@ -143,7 +143,7 @@ to_xml(#t_fun{args = As, range = T}, Env) ->
     {'fun', [{argtypes, map(fun wrap_utype/2, As, Env)},
 	     wrap_utype(T, Env)]};
 to_xml(#t_map{ types = Ts}, Env) ->
-    {map, map(fun wrap_utype/2, Ts, Env)};
+    {map, map(fun to_xml/2, Ts, Env)};
 to_xml(#t_map_field{ k_type=K, v_type=V}, Env) ->
     {map_field, [wrap_utype(K,Env), wrap_utype(V, Env)]};
 to_xml(#t_tuple{types = Ts}, Env) ->
diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl
index cbdbbbee80..1075c47801 100644
--- a/lib/erl_docgen/src/docgen_otp_specs.erl
+++ b/lib/erl_docgen/src/docgen_otp_specs.erl
@@ -390,8 +390,6 @@ t_type([#xmlElement{name = tuple, content = Es}]) ->
     t_tuple(Es);
 t_type([#xmlElement{name = map, content = Es}]) ->
     t_map(Es);
-t_type([#xmlElement{name = map_field, content = Es}]) ->
-    t_map_field(Es);
 t_type([#xmlElement{name = 'fun', content = Es}]) ->
     ["fun("] ++ t_fun(Es) ++ [")"];
 t_type([E = #xmlElement{name = record, content = Es}]) ->
@@ -435,9 +433,10 @@ t_tuple(Es) ->
     ["{"] ++ seq(fun t_utype_elem/1, Es, ["}"]).
 
 t_map(Es) ->
-    ["#{"] ++ seq(fun t_utype_elem/1, Es, ["}"]).
+    Fs = get_elem(map_field, Es),
+    ["#{"] ++ seq(fun t_map_field/1, Fs, ["}"]).
 
-t_map_field([K,V]) ->
+t_map_field(#xmlElement{content = [K,V]}) ->
     [t_utype_elem(K) ++ " => " ++ t_utype_elem(V)].
 
 t_fun(Es) ->
@@ -557,14 +556,12 @@ ot_type([#xmlElement{name = tuple, content = Es}]) ->
     ot_tuple(Es);
 ot_type([#xmlElement{name = map, content = Es}]) ->
     ot_map(Es);
-ot_type([#xmlElement{name = map_field, content = Es}]) ->
-    ot_map_field(Es);
 ot_type([#xmlElement{name = 'fun', content = Es}]) ->
     ot_fun(Es);
 ot_type([#xmlElement{name = record, content = Es}]) ->
     ot_record(Es);
 ot_type([#xmlElement{name = abstype, content = Es}]) ->
-     ot_abstype(Es);
+    ot_abstype(Es);
 ot_type([#xmlElement{name = union, content = Es}]) ->
     ot_union(Es).
 
@@ -616,10 +613,10 @@ ot_tuple(Es) ->
     {type,0,tuple,[ot_utype_elem(E) || E <- Es]}.
 
 ot_map(Es) ->
-    {type,0,map,[ot_utype_elem(E) || E <- Es]}.
+    {type,0,map,[ot_map_field(E) || E <- get_elem(map_field,Es)]}.
 
-ot_map_field(Es) ->
-    {type,0,map_field_assoc,[ot_utype_elem(E) || E <- Es]}.
+ot_map_field(#xmlElement{content=[K,V]}) ->
+    {type,0,map_field_assoc, ot_utype_elem(K), ot_utype_elem(V)}.
 
 ot_fun(Es) ->
     Range = ot_utype(get_elem(type, Es)),
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index 82bc2c1460..3dbb5ab64c 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -300,7 +300,15 @@ map_pair_types(Fs) ->
     tuple_type(Fs, fun map_pair_type/1).
 
 map_pair_type({type,_Line,map_field_assoc,Ktype,Vtype}) ->
-    {seq,[],[]," =>",[ltype(Ktype),ltype(Vtype)]}.
+    map_assoc_typed(lexpr(Ktype, options(none)), Vtype).
+
+map_assoc_typed(B, {type,_,union,Ts}) ->
+    {first,[B,$\s],{seq,[],[],[],map_assoc_union_type(Ts)}};
+map_assoc_typed(B, Type) ->
+    {list,[{cstep,[B," =>"],ltype(Type)}]}.
+
+map_assoc_union_type([T|Ts]) ->
+    [[leaf("=> "),ltype(T)] | ltypes(Ts, fun union_elem/1)].
 
 record_type(Name, Fields) ->
     {first,[record_name(Name)],field_types(Fields)}.