Move load_dot_iex to IEx.Server, after require IEx.Helpers

Author: alco

lib/iex/lib/iex.ex

@@ -121,8 +121,6 @@ defmodule IEx do
 
   """
 
-  alias IEx.Util
-
   @doc """
   Registers a function to be invoked after IEx process is spawned.
   """
@@ -183,7 +181,6 @@ defmodule IEx do
 
       set_expand_fun()
       run_after_spawn()
-      config = load_dot_iex(config)
       IEx.Server.start(config)
     end
   end
@@ -235,28 +232,4 @@ defmodule IEx do
   defp run_after_spawn do
     lc fun inlist Enum.reverse(after_spawn), do: fun.()
   end
-
-  # Locates and loads an .iex file from one of predefined locations
-  defp load_dot_iex(config) do
-    path = Enum.find [".iex", "~/.iex"], fn path -> File.regular?(Path.expand(path)) end
-    if nil?(path) do
-      config
-    else
-      try do
-        code = File.read!(path)
-
-        # Evaluate the contents in the same environment IEx.Server will run in
-        { _result, binding, scope } = :elixir.eval(:unicode.characters_to_list(code), config.binding, 0, config.scope)
-        config.binding(binding).scope(scope)
-      rescue
-        exception ->
-          Util.print_exception(exception, System.stacktrace)
-          System.halt(1)
-      catch
-        kind, error ->
-          Util.print_error(kind, error, System.stacktrace)
-          System.halt(1)
-      end
-    end
-  end
 end

lib/iex/lib/iex/server.ex

@@ -1,8 +1,6 @@
 defmodule IEx.Server do
   @moduledoc false
 
-  alias IEx.Util
-
   @doc """
   Eval loop for an IEx session. Its responsibilities include:
 
@@ -15,7 +13,9 @@ defmodule IEx.Server do
     IO.puts "Interactive Elixir (#{System.version}) - press Ctrl+C to exit (type h() ENTER for help)"
     Process.put :iex_history, []
     { _, _, scope } = :elixir.eval('require IEx.Helpers', [], 0, config.scope)
-    do_loop(config.scope(scope))
+    config = config.scope(scope)
+    config = load_dot_iex(config)
+    do_loop(config)
   end
 
   defp do_loop(config) do
@@ -28,11 +28,11 @@ defmodule IEx.Server do
         eval(code, line, counter, config)
       rescue
         exception ->
-          Util.print_exception(exception, System.stacktrace)
+          print_exception(exception, System.stacktrace)
           config.cache('')
       catch
         kind, error ->
-          Util.print_error(kind, error, System.stacktrace)
+          print_error(kind, error, System.stacktrace)
           config.cache('')
       end
 
@@ -88,6 +88,31 @@ defmodule IEx.Server do
     end
   end
 
+  # Locates and loads an .iex file from one of predefined locations. Returns
+  # new config.
+  defp load_dot_iex(config) do
+    path = Enum.find [".iex", "~/.iex"], fn path -> File.regular?(Path.expand(path)) end
+    if nil?(path) do
+      config
+    else
+      try do
+        code = File.read!(path)
+
+        # Evaluate the contents in the same environment do_loop will run in
+        { _result, binding, scope } = :elixir.eval(:unicode.characters_to_list(code), config.binding, 0, config.scope)
+        config.binding(binding).scope(scope)
+      rescue
+        exception ->
+          print_exception(exception, System.stacktrace)
+          System.halt(1)
+      catch
+        kind, error ->
+          print_error(kind, error, System.stacktrace)
+          System.halt(1)
+      end
+    end
+  end
+
   defp update_history(config) do
     current = Process.get :iex_history
     Process.put :iex_history, [config|current]
@@ -113,7 +138,33 @@ defmodule IEx.Server do
     IO.puts :stdio, IO.ANSI.escape("%{yellow}#{inspect(result, IEx.inspect_opts)}")
   end
 
+  defp io_error(result) do
+    IO.puts :stdio, result
+  end
+
   defp remote_prefix do
     if node == node(:erlang.group_leader), do: "iex", else: "rem"
   end
+
+  defp print_exception(exception, stacktrace) do
+    print_stacktrace stacktrace, fn ->
+      "** (#{inspect exception.__record__(:name)}) #{exception.message}"
+    end
+  end
+
+  defp print_error(kind, reason, stacktrace) do
+    print_stacktrace stacktrace, fn ->
+      "** (#{kind}) #{inspect(reason)}"
+    end
+  end
+
+  defp print_stacktrace(trace, callback) do
+    try do
+      io_error callback.()
+      io_error Exception.format_stacktrace(trace)
+    catch
+      _, _ ->
+        io_error "** (IEx.Error) error when printing exception message and stacktrace"
+    end
+  end
 end