From 925998c360879bda303e1dac022032fc8fe648d2 Mon Sep 17 00:00:00 2001
From: Evgeny Khramtsov <ekhramtsov@process-one.net>
Date: Fri, 8 Nov 2019 10:20:18 +0300
Subject: [PATCH] Preserve order of grouped duplicates

---
 src/econf.erl | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/econf.erl b/src/econf.erl
index e1231ea69..75817a641 100644
--- a/src/econf.erl
+++ b/src/econf.erl
@@ -232,13 +232,18 @@ format_join(L) ->
 %% into a single option with all list-values being concatenated
 -spec group_dups(list(T)) -> list(T).
 group_dups(Y1) ->
-    {Y2, D} = lists:mapfoldl(
-                fun({Option, Values}, Acc) when is_list(Values) ->
-                        {[], dict:append_list(Option, Values, Acc)};
-                   (Other, Acc) ->
-                        {[Other], Acc}
-                end, dict:new(), Y1),
-    lists:append(Y2) ++ dict:to_list(D).
+    lists:reverse(
+      lists:foldl(
+        fun({Option, Values}, Acc) when is_list(Values) ->
+                case lists:keyfind(Option, 1, Acc) of
+                    {Option, Vals} when is_list(Vals) ->
+                        lists:keyreplace(Option, 1, Acc, {Option, Vals ++ Values});
+                    _ ->
+                        [{Option, Values}|Acc]
+                end;
+           (Other, Acc) ->
+                [Other|Acc]
+        end, [], Y1)).
 
 %%%===================================================================
 %%% Validators from yconf