Merge pull request #4703 from lexmag/separated-diff

Separated ExUnit difference highlighting

Author: lexmag

lib/elixir/lib/string.ex

@@ -1941,7 +1941,7 @@ defmodule String do
   end
 
   @doc """
-  Returns a keyword list that represents an edit graph.
+  Returns a keyword list that represents an edit script.
 
   The algorithm is outlined in the
   "An O(ND) Difference Algorithm and Its Variations" paper by E. Myers.

lib/ex_unit/examples/difference.exs

@@ -74,8 +74,8 @@ defmodule Difference do
   end
 
   test "maps; mixed diff" do
-    map1 = Enum.into(1..40, %{}, &{&1, &1}) |> Map.delete(33)
-    map2 = Enum.reduce(5..10, map1, &Map.delete(&2, &1)) |> Map.put(33, 33) |> Map.put(23, 32)
+    map1 = Enum.into(1..15, %{}, &{&1, &1}) |> Map.delete(13)
+    map2 = Enum.reduce(5..10, map1, &Map.delete(&2, &1)) |> Map.put(13, 13) |> Map.put(12, 32)
     assert map1 == map2
   end
 

lib/ex_unit/lib/ex_unit/assertions.ex

@@ -3,8 +3,6 @@ defmodule ExUnit.AssertionError do
   Raised to signal an assertion error.
   """
 
-  alias ExUnit.Formatter, as: F
-
   @no_value :ex_unit_no_meaningful_value
 
   defexception left:    @no_value,
@@ -19,8 +17,9 @@ defmodule ExUnit.AssertionError do
     @no_value
   end
 
-  def message(assertion_error) do
-    "\n\n" <> F.format_assertion_error(assertion_error, :infinity, &formatter/2, "")
+  def message(exception) do
+    "\n\n" <>
+      ExUnit.Formatter.format_assertion_error(exception, :infinity, &formatter/2, "")
   end
 
   defp formatter(_, msg), do: msg