Fixes AdRoll#249: Spacing for empty records (AdRoll#256)

vkatsuba · May 6, 2021 · 6c400e4 · 6c400e4
1 parent 9c46cdd
commit 6c400e4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/formatters/default_formatter.erl b/src/formatters/default_formatter.erl
@@ -1505,6 +1505,8 @@ number_from_text(Text, Default) ->
 
 lay_fields(Opening, Exprs, Ctxt = #ctxt{spaces_around_fields = false}, Fun) ->
     beside(Opening, beside(lay_fields(Exprs, Ctxt, Fun), lay_text_float("}")));
+lay_fields(Opening, [] = Exprs, Ctxt = #ctxt{spaces_around_fields = true}, Fun) ->
+    lay_fields(Opening, Exprs, Ctxt#ctxt{spaces_around_fields = false}, Fun);
 lay_fields(Opening, Exprs, Ctxt = #ctxt{spaces_around_fields = true}, Fun) ->
     par([par([Opening, lay_fields(Exprs, Ctxt, Fun)], Ctxt#ctxt.break_indent),
          lay_text_float("}")]).

diff --git a/test_app/after/src/records.erl b/test_app/after/src/records.erl
@@ -1,10 +1,15 @@
 -module(records).
 
+-format #{ spaces_around_fields => true }.
+
 -record(record, {with_another :: #record{}, in_it}).
+-record(rec, {}).
 
--type record() :: #record{in_it :: 1..3}.
+-type record() :: #record{ in_it :: 1..3 }.
+-type rec() :: #rec{}.
 
 f(A) ->
+    _ = #rec{},
     B = C = A#record.with_another#record.with_another#record.in_it,
-    D = A#record{with_another = #record{with_another = #record{in_it = B}, in_it = C}},
+    D = A#record{ with_another = #record{ with_another = #record{ in_it = B }, in_it = C } },
     (normalize(D))#record.with_another#record.in_it.
diff --git a/test_app/src/records.erl b/test_app/src/records.erl
@@ -1,9 +1,14 @@
 -module(records).
 
+-format #{spaces_around_fields => true}.
+
 -record(record, {with_another :: #record{}, in_it}).
+-record(rec, {}).
 -type record() :: #record{in_it :: 1..3}.
+-type rec() :: #rec{}.
 
 f(A) ->
+    _ = #rec{},
     B = C = A#record.with_another#record.with_another#record.in_it,
     D = A#record{with_another = #record{with_another = #record{in_it = B}, in_it = C}},
     (normalize(D))#record.with_another#record.in_it.