Include column in unused alias and imports warning messages (#12593)

Author: viniciusmuller

lib/elixir/lib/kernel/lexical_tracker.ex

@@ -35,13 +35,13 @@ defmodule Kernel.LexicalTracker do
   end
 
   @doc false
-  def add_import(pid, module, fas, line, warn) when is_atom(module) do
-    :gen_server.cast(pid, {:add_import, module, fas, line, warn})
+  def add_import(pid, module, fas, meta, warn) when is_atom(module) do
+    :gen_server.cast(pid, {:add_import, module, fas, meta, warn})
   end
 
   @doc false
-  def add_alias(pid, module, line, warn) when is_atom(module) do
-    :gen_server.cast(pid, {:add_alias, module, line, warn})
+  def add_alias(pid, module, meta, warn) when is_atom(module) do
+    :gen_server.cast(pid, {:add_alias, module, meta, warn})
   end
 
   @doc false
@@ -209,18 +209,18 @@ defmodule Kernel.LexicalTracker do
     {:noreply, put_in(state.exports[module], true)}
   end
 
-  def handle_cast({:add_import, module, fas, line, warn}, state) do
+  def handle_cast({:add_import, module, fas, meta, warn}, state) do
     if warn do
-      imports = for module_or_fa <- [module | fas], do: {module_or_fa, line}, into: %{}
+      imports = for module_or_fa <- [module | fas], do: {module_or_fa, meta}, into: %{}
       {:noreply, put_in(state.imports[module], imports)}
     else
       {:noreply, state}
     end
   end
 
-  def handle_cast({:add_alias, module, line, warn}, state) do
+  def handle_cast({:add_alias, module, meta, warn}, state) do
     if warn do
-      {:noreply, put_in(state.aliases[module], line)}
+      {:noreply, put_in(state.aliases[module], meta)}
     else
       {:noreply, state}
     end

lib/elixir/src/elixir_lexical.erl

@@ -38,10 +38,10 @@ trace({import, Meta, Module, Opts}, #{lexical_tracker := Pid}) ->
       _ -> []
     end,
 
-  ?tracker:add_import(Pid, Module, Only, ?line(Meta), Imported and should_warn(Meta, Opts)),
+  ?tracker:add_import(Pid, Module, Only, Meta, Imported and should_warn(Meta, Opts)),
   ok;
 trace({alias, Meta, _Old, New, Opts}, #{lexical_tracker := Pid}) ->
-  ?tracker:add_alias(Pid, New, ?line(Meta), should_warn(Meta, Opts)),
+  ?tracker:add_alias(Pid, New, Meta, should_warn(Meta, Opts)),
   ok;
 trace({alias_expansion, _Meta, Lookup, _Result}, #{lexical_tracker := Pid}) ->
   ?tracker:alias_dispatch(Pid, Lookup),
@@ -110,9 +110,9 @@ with_file(File, #{lexical_tracker := Pid} = E, Callback) ->
 %% ERROR HANDLING
 
 warn_unused_imports(Pid, E) ->
-  [elixir_errors:file_warn([{line, Line}], ?key(E, file), ?MODULE, {unused_import, ModOrMFA})
+  [elixir_errors:file_warn(Meta, ?key(E, file), ?MODULE, {unused_import, ModOrMFA})
    || {Module, Imports} <- ?tracker:collect_unused_imports(Pid),
-      {ModOrMFA, Line} <- unused_imports_for_module(Module, Imports)],
+      {ModOrMFA, Meta} <- unused_imports_for_module(Module, Imports)],
   ok.
 
 unused_imports_for_module(Module, Imports) ->
@@ -122,8 +122,8 @@ unused_imports_for_module(Module, Imports) ->
   end.
 
 warn_unused_aliases(Pid, E) ->
-  [elixir_errors:file_warn([{line, Line}], ?key(E, file), ?MODULE, {unused_alias, Module})
-   || {Module, Line} <- ?tracker:collect_unused_aliases(Pid)],
+  [elixir_errors:file_warn(Meta, ?key(E, file), ?MODULE, {unused_alias, Module})
+   || {Module, Meta} <- ?tracker:collect_unused_aliases(Pid)],
   ok.
 
 format_error({unused_alias, Module}) ->

lib/elixir/test/elixir/code_test.exs

@@ -55,13 +55,41 @@ defmodule CodeTest do
                end)
     end
 
-    test "includes column information when possible" do
+    test "includes column information on unused variables" do
       assert {_, [%{position: {1, 12}}]} =
                Code.with_diagnostics(fn ->
                  quoted = Code.string_to_quoted!("if true do var = :foo end", columns: true)
                  Code.eval_quoted(quoted, [])
                end)
     end
+
+    test "includes column information on unused aliases" do
+      sample = """
+      defmodule CodeTest.UnusedAlias do
+        alias String.Chars
+      end
+      """
+
+      assert {_, [%{position: {2, 3}}]} =
+               Code.with_diagnostics(fn ->
+                 quoted = Code.string_to_quoted!(sample, columns: true)
+                 Code.eval_quoted(quoted, [])
+               end)
+    end
+
+    test "includes column information on unused imports" do
+      sample = """
+      defmodule CodeTest.UnusedImport do
+        import URI
+      end
+      """
+
+      assert {_, [%{position: {2, 3}}]} =
+               Code.with_diagnostics(fn ->
+                 quoted = Code.string_to_quoted!(sample, columns: true)
+                 Code.eval_quoted(quoted, [])
+               end)
+    end
   end
 
   describe "eval_string/1,2,3" do