Skip to content
This repository was archived by the owner on Jun 16, 2025. It is now read-only.

Commit dfe05fb

Browse files
committed
elbrujohalcon.otp_formatter.update- Reduce code duplication
1 parent 070fccd commit dfe05fb

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/formatters/default_formatter.erl

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,7 @@ lay_no_comments(Node, Ctxt) ->
594594
Ctxt1 = reset_prec(Ctxt),
595595
D1 = lay(erl_syntax:generator_pattern(Node), Ctxt1),
596596
D2 = lay(erl_syntax:generator_body(Node), Ctxt1),
597-
prettypr:par([D1,
598-
prettypr:beside(
599-
prettypr:text("<- "), D2)],
600-
Ctxt1#ctxt.break_indent);
597+
lay_generator(D1, D2, Ctxt1);
601598
binary_generator ->
602599
Ctxt1 = reset_prec(Ctxt),
603600
D1 = lay(erl_syntax:binary_generator_pattern(Node), Ctxt1),
@@ -610,7 +607,7 @@ lay_no_comments(Node, Ctxt) ->
610607
Ctxt1 = reset_prec(Ctxt),
611608
D1 = lay(erl_syntax:map_generator_pattern(Node), Ctxt1),
612609
D2 = lay(erl_syntax:map_generator_body(Node), Ctxt1),
613-
prettypr:par([D1, prettypr:beside(prettypr:text("<- "), D2)], Ctxt1#ctxt.break_indent);
610+
lay_generator(D1, D2, Ctxt1);
614611
implicit_fun ->
615612
D = lay(erl_syntax:implicit_fun_name(Node), reset_prec(Ctxt)),
616613
prettypr:beside(lay_text_float("fun "), D);
@@ -631,7 +628,7 @@ lay_no_comments(Node, Ctxt) ->
631628
D1 = lay(erl_syntax:map_comp_template(Node), Ctxt1),
632629
D2 = lay_items(erl_syntax:map_comp_body(Node), Ctxt1, fun lay/2),
633630
D3 = prettypr:beside(lay_text_float("|| "), prettypr:beside(D2, lay_text_float("}"))),
634-
prettypr:beside(lay_text_float("#{"),prettypr:par([D1, D3]));
631+
prettypr:beside(lay_text_float("#{"), prettypr:par([D1, D3]));
635632
macro ->
636633
%% This is formatted similar to a normal function call or a variable
637634
N = macro_name(Node, variable),
@@ -1095,6 +1092,12 @@ maybe_convert_to_qualifier(Node, #ctxt{force_arity_qualifiers = true}) ->
10951092
Node
10961093
end.
10971094

1095+
lay_generator(D1, D2, Ctxt) ->
1096+
prettypr:par([D1,
1097+
prettypr:beside(
1098+
prettypr:text("<- "), D2)],
1099+
Ctxt#ctxt.break_indent).
1100+
10981101
lay_nested_infix_expr(Node, #ctxt{parenthesize_infix_operations = false} = Ctxt) ->
10991102
lay(Node, Ctxt);
11001103
lay_nested_infix_expr(Node, #ctxt{parenthesize_infix_operations = true} = Ctxt) ->

0 commit comments

Comments
 (0)