Don't process ANSI escapes in strings in IEx

Author: alco

lib/iex/lib/iex.ex

@@ -244,26 +244,13 @@ defmodule IEx do
   end
 
   @doc """
-  Returns `string` escaped using the specified color.
+  Returns `string` escaped using the specified color. ANSI escapes in `string`
+  are not processed in any way.
   """
   def color(color_name, string) do
     colors = IEx.Options.get(:colors)
-    IO.ANSI.escape "%{#{colors[color_name]}}#{string}", colors[:enabled]
-  end
-
-  @doc """
-  Returns an escaped fragment using the specified color.
-  """
-  def color_fragment(color_name) do
-    colors = IEx.Options.get(:colors)
-    IO.ANSI.escape_fragment "%{#{colors[color_name]}}", colors[:enabled]
-  end
-
-  @doc """
-  Returns an escaped fragment that resets colors and attributes.
-  """
-  def color_reset() do
-    colors = IEx.Options.get(:colors)
-    IO.ANSI.escape_fragment "%{reset}", colors[:enabled]
+    enabled = colors[:enabled]
+    IO.ANSI.escape_fragment("%{#{colors[color_name]}}", enabled)
+      <> string <> IO.ANSI.escape_fragment("%{reset}", enabled)
   end
 end

lib/iex/lib/iex/introspection.ex

@@ -9,10 +9,8 @@ defmodule IEx.Introspection do
       { :module, _ } ->
         case module.__info__(:moduledoc) do
           { _, binary } when is_binary(binary) ->
-            IO.puts IEx.color(:info, "# #{inspect module}\n")
-            # We use fragments here so that escape sequences in `binary` are
-            # treated literally and don't get converted to ANSI escapes.
-            IO.write IEx.color_fragment(:info) <> binary <> IEx.color_reset()
+            # FIXME: add tests for `binary` containing ANSI escapes
+            IO.write IEx.color(:info, "# #{inspect module}\n" <> binary)
           { _, _ } ->
             IO.puts IEx.color(:error, "No docs for #{inspect module} have been found")
           _ ->
@@ -150,9 +148,8 @@ defmodule IEx.Introspection do
   defp print_doc({ { fun, _ }, _line, kind, args, doc }) do
     args = Enum.map_join(args, ", ", print_doc_arg(&1))
     IO.puts IEx.color(:info, "* #{kind} #{fun}(#{args})\n")
-    # We use fragments here so that escape sequences in `doc` are
-    # treated literally and don't get converted to ANSI escapes.
-    if doc, do: IO.write IEx.color_fragment(:info) <> doc <> IEx.color_reset()
+    # FIXME: add tests for `doc` containing ANSI escapes
+    if doc, do: IO.write IEx.color(:info, doc)
   end
 
   defp print_doc_arg({ ://, _, [left, right] }) do

lib/iex/lib/iex/server.ex

@@ -157,9 +157,8 @@ defmodule IEx.Server do
   end
 
   defp io_put(result) do
-    IO.puts IEx.color_fragment(:eval_result) <>
-            inspect(result, IEx.Options.get(:inspect)) <>
-            IEx.color_reset()
+    # FIXME: add tests for `result` containing ANSI escapes
+    IO.puts IEx.color(:eval_result, inspect(result, IEx.Options.get(:inspect)))
   end
 
   defp io_error(result) do