Move imported_quoted event to elixir_quote module

Author: josevalim

lib/elixir/src/elixir_dispatch.erl

@@ -46,23 +46,7 @@ find_imports(Meta, Name, E) ->
   Acc1 = find_imports_by_name(Funs, Acc0, Name, Meta, E),
   Acc2 = find_imports_by_name(Macs, Acc1, Name, Meta, E),
 
-  Imports = lists:sort(maps:to_list(Acc2)),
-  trace_import_quoted(Imports, Meta, Name, E),
-  Imports.
-
-trace_import_quoted([{Arity, Mod} | Imports], Meta, Name, E) ->
-  {Rest, Arities} = collect_trace_import_quoted(Imports, Mod, [], [Arity]),
-  elixir_env:trace({imported_quoted, Meta, Mod, Name, Arities}, E),
-  trace_import_quoted(Rest, Meta, Name, E);
-trace_import_quoted([], _Meta, _Name, _E) ->
-  ok.
-
-collect_trace_import_quoted([{Arity, Mod} | Imports], Mod, Acc, Arities) ->
-  collect_trace_import_quoted(Imports, Mod, Acc, [Arity | Arities]);
-collect_trace_import_quoted([Import | Imports], Mod, Acc, Arities) ->
-  collect_trace_import_quoted(Imports, Mod, [Import | Acc], Arities);
-collect_trace_import_quoted([], _Mod, Acc, Arities) ->
-  {lists:reverse(Acc), lists:reverse(Arities)}.
+  lists:sort(maps:to_list(Acc2)).
 
 %% Function retrieval
 

lib/elixir/src/elixir_quote.erl

@@ -380,6 +380,7 @@ import_meta(Meta, Name, Arity, Q, E) ->
   case (keyfind(imports, Meta) == false) andalso
       elixir_dispatch:find_imports(Meta, Name, E) of
     [_ | _] = Imports ->
+      trace_import_quoted(Imports, Meta, Name, E),
       keystore(imports, keystore(context, Meta, Q#elixir_quote.context), Imports);
 
     _ ->
@@ -389,6 +390,20 @@ import_meta(Meta, Name, Arity, Q, E) ->
       end
   end.
 
+trace_import_quoted([{Arity, Mod} | Imports], Meta, Name, E) ->
+  {Rest, Arities} = collect_trace_import_quoted(Imports, Mod, [], [Arity]),
+  elixir_env:trace({imported_quoted, Meta, Mod, Name, Arities}, E),
+  trace_import_quoted(Rest, Meta, Name, E);
+trace_import_quoted([], _Meta, _Name, _E) ->
+  ok.
+
+collect_trace_import_quoted([{Arity, Mod} | Imports], Mod, Acc, Arities) ->
+  collect_trace_import_quoted(Imports, Mod, Acc, [Arity | Arities]);
+collect_trace_import_quoted([Import | Imports], Mod, Acc, Arities) ->
+  collect_trace_import_quoted(Imports, Mod, [Import | Acc], Arities);
+collect_trace_import_quoted([], _Mod, Acc, Arities) ->
+  {lists:reverse(Acc), lists:reverse(Arities)}.
+
 %% do_quote_*
 
 do_quote_call(Left, Meta, Expr, Args, Q) ->