track alias expansion

Author: lukaszsamson

lib/elixir_sense/core/compiler.ex

@@ -80,7 +80,10 @@ defmodule ElixirSense.Core.Compiler do
             acc
             |> State.add_call_to_line({name, nil, nil}, meta, :struct_expansion)
 
-          # TODO: handle :alias_expansion
+          {:alias_expansion, meta, as, alias} ->
+            acc
+            |> State.add_call_to_line({as, nil, nil}, meta, :alias_expansion_as)
+            |> State.add_call_to_line({alias, nil, nil}, meta, :alias_expansion)
 
           _ ->
             Logger.warning("Unhandled trace event: #{inspect(event)}")
@@ -2830,8 +2833,7 @@ defmodule ElixirSense.Core.Compiler do
   end
 
   defp expand_aliases({:__aliases__, meta, [head | tail] = list}, state, env, report) do
-    # TODO pass true to track alias_expansion?
-    case NormalizedMacroEnv.expand_alias(env, meta, list, trace: false) do
+    case NormalizedMacroEnv.expand_alias(env, meta, list, trace: true) do
       {:alias, alias} ->
         state =
           if report do

lib/elixir_sense/core/compiler/macro.ex

@@ -83,8 +83,7 @@ defmodule ElixirSense.Core.Compiler.Macro do
   end
 
   defp do_expand_once({:__aliases__, meta, [head | tail] = list} = alias, env) do
-    # TODO pass true to track alias_expansion?
-    case NormalizedMacroEnv.expand_alias(env, meta, list, trace: false) do
+    case NormalizedMacroEnv.expand_alias(env, meta, list, trace: true) do
       {:alias, alias} ->
         :elixir_env.trace({:alias_reference, meta, alias}, env)
         {alias, true}

lib/elixir_sense/core/compiler/quote.ex

@@ -204,9 +204,8 @@ defmodule ElixirSense.Core.Compiler.Quote do
          state
        )
        when is_atom(h) and h != Elixir and is_list(meta) do
-    # TODO pass true to track alias_expansion?
     annotation =
-      case NormalizedMacroEnv.expand_alias(e, meta, list, trace: false) do
+      case NormalizedMacroEnv.expand_alias(e, meta, list, trace: true) do
         {:alias, atom} ->
           atom
 

lib/elixir_sense/core/compiler/typespec.ex

@@ -638,8 +638,7 @@ defmodule ElixirSense.Core.Compiler.Typespec do
   # This is a modified backport of Macro.expand/2 because we want to expand
   # aliases but we don't them to become compile-time references.
   defp expand_remote({:__aliases__, meta, [head | tail] = list} = alias, env) do
-    # TODO pass true to track alias_expansion?
-    case NormalizedMacroEnv.expand_alias(env, meta, list, trace: false) do
+    case NormalizedMacroEnv.expand_alias(env, meta, list, trace: true) do
       {:alias, alias} ->
         alias
 

test/elixir_sense/core/metadata_builder_test.exs

@@ -8523,6 +8523,20 @@ defmodule ElixirSense.Core.MetadataBuilderTest do
                  mod: Kernel,
                  arity: 2
                },
+               %ElixirSense.Core.State.CallInfo{
+                 arity: nil,
+                 position: {3, 17},
+                 mod: ElixirSense.Core.MetadataBuilderTest.QuotedCalls,
+                 func: nil,
+                 kind: :alias_expansion
+               },
+               %ElixirSense.Core.State.CallInfo{
+                 arity: nil,
+                 position: {3, 17},
+                 mod: Q,
+                 func: nil,
+                 kind: :alias_expansion_as
+               },
                %ElixirSense.Core.State.CallInfo{
                  func: :foo,
                  kind: :remote_macro,

test/support/references_tracer.ex

@@ -127,6 +127,26 @@ defmodule ElixirSense.Core.References.Tracer do
     :ok
   end
 
+  def trace({:alias_expansion, meta, as, alias}, %Macro.Env{} = env) do
+    register_call(%{
+      callee: {as, nil, nil},
+      file: env.file |> Path.relative_to_cwd(),
+      line: meta[:line],
+      column: meta[:column],
+      kind: :alias_expansion_as
+    })
+
+    register_call(%{
+      callee: {alias, nil, nil},
+      file: env.file |> Path.relative_to_cwd(),
+      line: meta[:line],
+      column: meta[:column],
+      kind: :alias_expansion
+    })
+
+    :ok
+  end
+
   def trace(_trace, _env) do
     :ok
   end