Can format MapSets

BjRo · Feb 27, 2016 · 97a4e4e · 97a4e4e
1 parent 37289ff
commit 97a4e4e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/lib/apex/format.ex b/lib/apex/format.ex
@@ -92,15 +92,14 @@ defimpl Apex.Format, for: HashDict do
 end
 
 defimpl Apex.Format, for: HashSet do
-  import Apex.Format.Utils
+  def format(data, options \\ []) do
+    Apex.Format.Seq.format_set("HashSet", data, options)
+  end
+end
 
+defimpl Apex.Format, for: MapSet do
   def format(data, options \\ []) do
-    Apex.Format.Seq.format(
-      Set.to_list(data),
-      options,
-      start_token: "HashSet<[",
-      end_token: "]>",
-      numbers: false) |> colorize(data, options)
+    Apex.Format.Seq.format_set("MapSet", data, options)
   end
 end
 

diff --git a/lib/apex/format/seq.ex b/lib/apex/format/seq.ex
@@ -2,6 +2,15 @@ defmodule Apex.Format.Seq do
   import Apex.Format.Utils
   @list []
 
+  def format_set(name, data, options \\ []) do
+    format(
+      Set.to_list(data) |> Enum.sort,
+      options,
+      start_token: "#{name}<[",
+      end_token: "]>",
+      numbers: false) |> colorize(data, options)
+  end
+
   def format(data, options, config \\ []) do
     pre  =  start_token(config) <> new_line
     post =  indent(options) <> end_token(config) <> new_line

diff --git a/test/format_test.exs b/test/format_test.exs
@@ -97,8 +97,18 @@ defmodule Apex.Format.Test do
     set = HashSet.new |> HashSet.put(:foo) |> HashSet.put(:baz)
     assert format(set, color: false) == """
     HashSet<[
+      baz
       foo
+    ]>
+    """
+  end
+
+  test "Can format MapSets" do
+    set = MapSet.new |> MapSet.put(:foo) |> MapSet.put(:baz)
+    assert format(set, color: false) == """
+    MapSet<[
       baz
+      foo
     ]>
     """
   end