Fix inspect for Regexes with terminator, closes #6255

Author: José Valim

lib/elixir/lib/inspect.ex

@@ -417,31 +417,28 @@ defimpl Inspect, for: Regex do
   defp escape(bin, term),
     do: escape(bin, [], term)
 
-  defp escape(<<?\\, term>> <> rest, buf, term),
-    do: escape(rest, [buf | [?\\, term]], term)
-
-  defp escape(<<term>> <> rest, buf, term),
+  defp escape(<<term, rest::binary>>, buf, term),
     do: escape(rest, [buf | [?\\, term]], term)
 
   # The list of characters is from 'String.printable?' implementation
   # minus characters treated specially by regex: \s, \d, \b, \e
 
-  defp escape(<<?\n>> <> rest, buf, term),
+  defp escape(<<?\n, rest::binary>>, buf, term),
     do: escape(rest, [buf | '\\n'], term)
 
-  defp escape(<<?\r>> <> rest, buf, term),
+  defp escape(<<?\r, rest::binary>>, buf, term),
     do: escape(rest, [buf | '\\r'], term)
 
-  defp escape(<<?\t>> <> rest, buf, term),
+  defp escape(<<?\t, rest::binary>>, buf, term),
     do: escape(rest, [buf | '\\t'], term)
 
-  defp escape(<<?\v>> <> rest, buf, term),
+  defp escape(<<?\v, rest::binary>>, buf, term),
     do: escape(rest, [buf | '\\v'], term)
 
-  defp escape(<<?\f>> <> rest, buf, term),
+  defp escape(<<?\f, rest::binary>>, buf, term),
     do: escape(rest, [buf | '\\f'], term)
 
-  defp escape(<<?\a>> <> rest, buf, term),
+  defp escape(<<?\a, rest::binary>>, buf, term),
     do: escape(rest, [buf | '\\a'], term)
 
   defp escape(<<char::utf8, rest::binary>>, buf, term)

lib/elixir/test/elixir/inspect_test.exs

@@ -560,8 +560,9 @@ defmodule Inspect.OthersTest do
            "~r/\\a\\x08\\x7F\\x1B\\f\\n\\r \\t\\v\\//"
     assert inspect(~r<\a\b\d\e\f\n\r\s\t\v/>) ==
            "~r/\\a\\b\\d\\e\\f\\n\\r\\s\\t\\v\\//"
-    opts = [syntax_colors: [regex: :red]]
-    assert inspect(~r/hi/, opts) ==
+    assert inspect(~r" \\/ ") ==
+           "~r/ \\\\\\/ /"
+    assert inspect(~r/hi/, syntax_colors: [regex: :red]) ==
            "\e[31m~r/hi/\e[0m"
   end
 end