Refactor IEx.Introspection.decompose/2

Author: renanroberto

lib/iex/lib/iex/helpers.ex

@@ -333,7 +333,7 @@ defmodule IEx.Helpers do
   """
   defmacro open(term) do
     quote do
-      IEx.Introspection.open(unquote(IEx.Introspection.decompose(term, __CALLER__)))
+      IEx.Introspection.open(unquote(Macro.escape(IEx.Introspection.decompose(term, __CALLER__))))
     end
   end
 
@@ -362,7 +362,7 @@ defmodule IEx.Helpers do
   """
   defmacro h(term) do
     quote do
-      IEx.Introspection.h(unquote(IEx.Introspection.decompose(term, __CALLER__)))
+      IEx.Introspection.h(unquote(Macro.escape(IEx.Introspection.decompose(term, __CALLER__))))
     end
   end
 
@@ -381,7 +381,7 @@ defmodule IEx.Helpers do
   """
   defmacro b(term) do
     quote do
-      IEx.Introspection.b(unquote(IEx.Introspection.decompose(term, __CALLER__)))
+      IEx.Introspection.b(unquote(Macro.escape(IEx.Introspection.decompose(term, __CALLER__))))
     end
   end
 
@@ -406,7 +406,7 @@ defmodule IEx.Helpers do
   """
   defmacro t(term) do
     quote do
-      IEx.Introspection.t(unquote(IEx.Introspection.decompose(term, __CALLER__)))
+      IEx.Introspection.t(unquote(Macro.escape(IEx.Introspection.decompose(term, __CALLER__))))
     end
   end
 

lib/iex/lib/iex/introspection.ex

@@ -11,16 +11,22 @@ defmodule IEx.Introspection do
   Decomposes an introspection call into `{mod, fun, arity}`,
   `{mod, fun}` or `mod`.
   """
+  def decompose(atom, _context) when is_atom(atom), do: atom
+
+  def decompose({:__aliases__, _, _} = module, context) do
+    Macro.expand(module, context)
+  end
+
   def decompose({:/, _, [call, arity]} = term, context) do
     case Macro.decompose_call(call) do
       {_mod, :__info__, []} when arity == 1 ->
-        {:{}, [], [Module, :__info__, 1]}
+        {Module, :__info__, 1}
 
       {mod, fun, []} ->
-        {:{}, [], [mod, fun, arity]}
+        {Macro.expand(mod, context), fun, arity}
 
       {fun, []} ->
-        {:{}, [], [find_decompose_fun_arity(fun, arity, context), fun, arity]}
+        {find_decompose_fun_arity(fun, arity, context), fun, arity}
 
       _ ->
         term
@@ -30,20 +36,20 @@ defmodule IEx.Introspection do
   def decompose(call, context) do
     case Macro.decompose_call(call) do
       {_mod, :__info__, []} ->
-        Macro.escape({Module, :__info__, 1})
-
-      {mod, fun, []} ->
-        {mod, fun}
+        {Module, :__info__, 1}
 
       {maybe_sigil, [_, _]} ->
         case Atom.to_string(maybe_sigil) do
           "sigil_" <> _ ->
-            {:{}, [], [find_decompose_fun_arity(maybe_sigil, 2, context), maybe_sigil, 2]}
+            {find_decompose_fun_arity(maybe_sigil, 2, context), maybe_sigil, 2}
 
           _ ->
             call
         end
 
+      {mod, fun, []} ->
+        {Macro.expand(mod, context), fun}
+
       {fun, []} ->
         {find_decompose_fun(fun, context), fun}
 

lib/mix/lib/mix/tasks/help.ex

@@ -106,8 +106,6 @@ defmodule Mix.Tasks.Help do
       module
       |> Code.string_to_quoted!()
       |> IEx.Introspection.decompose(__ENV__)
-      |> Code.eval_quoted()
-      |> elem(0)
       |> IEx.Introspection.h()
     after
       Application.put_env(:iex, :colors, iex_colors)