diff options
| author | Hans Bolinder <[email protected]> | 2019-01-16 10:07:16 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-01-16 10:07:16 +0100 |
| commit | f2a8366e9bd69a80a4735898e72ae608574ab59f (patch) | |
| tree | c67e7a6c51b982e6a7ea2c6ad19ed46aac87135a /lib/syntax_tools/src | |
| parent | 7000e101745cc028e4656eaaae3ea5a1a4498747 (diff) | |
| parent | 80b0574260924c4ef888fe319274f9303982d45b (diff) | |
| download | otp-f2a8366e9bd69a80a4735898e72ae608574ab59f.tar.gz otp-f2a8366e9bd69a80a4735898e72ae608574ab59f.tar.bz2 otp-f2a8366e9bd69a80a4735898e72ae608574ab59f.zip | |
Merge branch 'hasse/syntax_tools/fun_types/ERL-815/OTP-15519' into maint
* hasse/syntax_tools/fun_types/ERL-815/OTP-15519:
syntax_tools: Fix pretty-printing of type funs
Diffstat (limited to 'lib/syntax_tools/src')
| -rw-r--r-- | lib/syntax_tools/src/erl_prettypr.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl index 6906ef1553..6ad9bec2e6 100644 --- a/lib/syntax_tools/src/erl_prettypr.erl +++ b/lib/syntax_tools/src/erl_prettypr.erl @@ -1101,8 +1101,9 @@ lay_2(Node, Ctxt) -> Ctxt1 = reset_prec(Ctxt), D1 = lay(erl_syntax:constrained_function_type_body(Node), Ctxt1), + Ctxt2 = Ctxt1#ctxt{clause = undefined}, D2 = lay(erl_syntax:constrained_function_type_argument(Node), - Ctxt1), + Ctxt2), beside(D1, beside(floating(text(" when ")), D2)); @@ -1113,7 +1114,7 @@ lay_2(Node, Ctxt) -> _ -> {"fun(", ")"} end, - Ctxt1 = reset_prec(Ctxt), + Ctxt1 = (reset_prec(Ctxt))#ctxt{clause = undefined}, D1 = case erl_syntax:function_type_arguments(Node) of any_arity -> text("(...)"); |