aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2018-06-08 17:04:39 +0200
committerHans Bolinder <[email protected]>2018-06-11 08:48:33 +0200
commit705ff39a8052b433c2f2dede775cb068aca620d6 (patch)
tree87314baaa8e9fb4babb573af02a0740a012f11a2
parentcabbb94eab4d94f3c924f8854e3f030d7ceca9cc (diff)
downloadotp-705ff39a8052b433c2f2dede775cb068aca620d6.tar.gz
otp-705ff39a8052b433c2f2dede775cb068aca620d6.tar.bz2
otp-705ff39a8052b433c2f2dede775cb068aca620d6.zip
edoc, erl_docgen: Fix pretty-printing of type map()
Complex types including map() are now pretty-printed.
-rw-r--r--lib/edoc/src/edoc_layout.erl2
-rw-r--r--lib/erl_docgen/src/docgen_otp_specs.erl4
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index baa147410b..47ff7b21fc 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -1193,6 +1193,8 @@ ot_name(Es, T) ->
{atom,0,list_to_atom(Atom)},T]};
"tuple" when T =:= [] ->
{type,0,tuple,any};
+ "map" when T =:= [] ->
+ {type,0,map,any};
Atom ->
{type,0,list_to_atom(Atom),T}
end.
diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl
index 9f2b401f93..311ec1471a 100644
--- a/lib/erl_docgen/src/docgen_otp_specs.erl
+++ b/lib/erl_docgen/src/docgen_otp_specs.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -658,6 +658,8 @@ ot_name(Es, T) ->
{atom,0,list_to_atom(Atom)},T]};
"tuple" when T =:= [] ->
{type,0,tuple,any};
+ "map" when T =:= [] ->
+ {type,0,map,any};
Atom ->
{type,0,list_to_atom(Atom),T}
end.