Emit consistent position meta on fn capture traces (#12033)

Author: lukaszsamson

lib/elixir/src/elixir_expand.erl

@@ -536,14 +536,14 @@ resolve_super(Meta, Arity, E) ->
 
 expand_fn_capture(Meta, Arg, S, E) ->
   case elixir_fn:capture(Meta, Arg, S, E) of
-    {{remote, Remote, Fun, Arity}, SE, EE} ->
+    {{remote, Remote, Fun, Arity}, RemoteMeta, SE, EE} ->
       is_atom(Remote) andalso
-        elixir_env:trace({remote_function, Meta, Remote, Fun, Arity}, E),
+        elixir_env:trace({remote_function, RemoteMeta, Remote, Fun, Arity}, E),
       AttachedMeta = attach_context_module(Remote, Meta, E),
       {{'&', AttachedMeta, [{'/', [], [{{'.', [], [Remote, Fun]}, [], []}, Arity]}]}, SE, EE};
-    {{local, Fun, Arity}, _SE, #{function := nil}} ->
+    {{local, Fun, Arity}, _LocalMeta, _SE, #{function := nil}} ->
       form_error(Meta, E, ?MODULE, {undefined_local_capture, Fun, Arity});
-    {{local, Fun, Arity}, SE, EE} ->
+    {{local, Fun, Arity}, _LocalMeta, SE, EE} ->
       {{'&', Meta, [{'/', [], [{Fun, [], nil}, Arity]}]}, SE, EE};
     {expand, Expr, SE, EE} ->
       expand(Expr, SE, EE)

lib/elixir/src/elixir_fn.erl

@@ -38,14 +38,14 @@ fn_arity(Args) -> length(Args).
 
 %% Capture
 
-capture(Meta, {'/', _, [{{'.', _, [M, F]} = Dot, DotMeta, []}, A]}, S, E) when is_atom(F), is_integer(A) ->
+capture(Meta, {'/', _, [{{'.', _, [M, F]} = Dot, RequireMeta, []}, A]}, S, E) when is_atom(F), is_integer(A) ->
   Args = args_from_arity(Meta, A, E),
-  handle_capture_possible_warning(Meta, DotMeta, M, F, A, E),
-  capture_require(Meta, {Dot, Meta, Args}, S, E, true);
+  handle_capture_possible_warning(Meta, RequireMeta, M, F, A, E),
+  capture_require(Meta, {Dot, RequireMeta, Args}, S, E, true);
 
-capture(Meta, {'/', _, [{F, _, C}, A]}, S, E) when is_atom(F), is_integer(A), is_atom(C) ->
+capture(Meta, {'/', _, [{F, ImportMeta, C}, A]}, S, E) when is_atom(F), is_integer(A), is_atom(C) ->
   Args = args_from_arity(Meta, A, E),
-  capture_import(Meta, {F, Meta, Args}, S, E, true);
+  capture_import(Meta, {F, ImportMeta, Args}, S, E, true);
 
 capture(Meta, {{'.', _, [_, Fun]}, _, Args} = Expr, S, E) when is_atom(Fun), is_list(Args) ->
   capture_require(Meta, Expr, S, E, is_sequential_and_not_empty(Args));
@@ -94,7 +94,7 @@ capture_require(Meta, {{'.', DotMeta, [Left, Right]}, RequireMeta, Args}, S, E,
       end,
 
       Dot = {{'.', DotMeta, [ELeft, Right]}, RequireMeta, Args},
-      handle_capture(Res, Meta, Dot, SE, EE, Sequential);
+      handle_capture(Res, RequireMeta, Dot, SE, EE, Sequential);
 
     {EscLeft, Escaped} ->
       Dot = {{'.', DotMeta, [EscLeft, Right]}, RequireMeta, Args},
@@ -103,8 +103,8 @@ capture_require(Meta, {{'.', DotMeta, [Left, Right]}, RequireMeta, Args}, S, E,
 
 handle_capture(false, Meta, Expr, S, E, Sequential) ->
   capture_expr(Meta, Expr, S, E, Sequential);
-handle_capture(LocalOrRemote, _Meta, _Expr, S, E, _Sequential) ->
-  {LocalOrRemote, S, E}.
+handle_capture(LocalOrRemote, Meta, _Expr, S, E, _Sequential) ->
+  {LocalOrRemote, Meta, S, E}.
 
 capture_expr(Meta, Expr, S, E, Sequential) ->
   capture_expr(Meta, Expr, S, E, [], Sequential).

lib/elixir/test/elixir/kernel/expansion_test.exs

@@ -1081,7 +1081,8 @@ defmodule Kernel.ExpansionTest do
           fn -> 17 end
         end
 
-      assert expand(before_expansion) == after_expansion
+      assert clean_meta(expand(before_expansion), [:import, :context, :no_parens]) ==
+               after_expansion
     end
 
     test "fails on non-continuous" do

lib/elixir/test/elixir/kernel/tracers_test.exs

@@ -83,6 +83,26 @@ defmodule Kernel.TracersTest do
     assert meta[:column] == 11
   end
 
+  test "traces imports via capture" do
+    compile_string("""
+    import Integer, only: [is_odd: 1, parse: 1]
+    &is_odd/1
+    &parse/1
+    """)
+
+    assert_receive {{:import, meta, Integer, only: [is_odd: 1, parse: 1]}, _}
+    assert meta[:line] == 1
+    assert meta[:column] == 1
+
+    assert_receive {{:imported_macro, meta, Integer, :is_odd, 1}, _}
+    assert meta[:line] == 2
+    assert meta[:column] == 2
+
+    assert_receive {{:imported_function, meta, Integer, :parse, 1}, _}
+    assert meta[:line] == 3
+    assert meta[:column] == 2
+  end
+
   test "traces structs" do
     compile_string("""
     %URI{path: "/"}
@@ -118,11 +138,11 @@ defmodule Kernel.TracersTest do
 
     assert_receive {{:remote_macro, meta, Integer, :is_odd, 1}, _}
     assert meta[:line] == 2
-    assert meta[:column] == 1
+    assert meta[:column] == 10
 
     assert_receive {{:remote_function, meta, Integer, :parse, 1}, _}
     assert meta[:line] == 3
-    assert meta[:column] == 1
+    assert meta[:column] == 10
   end
 
   test "traces locals" do
@@ -157,11 +177,11 @@ defmodule Kernel.TracersTest do
 
     assert_receive {{:local_macro, meta, :foo, 1}, _}
     assert meta[:line] == 4
-    assert meta[:column] == 20
+    assert meta[:column] == 21
 
     assert_receive {{:local_function, meta, :bar, 1}, _}
     assert meta[:line] == 4
-    assert meta[:column] == 28
+    assert meta[:column] == 29
   after
     :code.purge(Sample)
     :code.delete(Sample)