do not emit alias_reference on alias expansion in typespec

Author: lukaszsamson

lib/elixir_sense/core/compiler/quote.ex

@@ -1,7 +1,6 @@
 defmodule ElixirSense.Core.Compiler.Quote do
   alias ElixirSense.Core.Compiler.Dispatch
   alias ElixirSense.Core.Normalized.Macro.Env, as: NormalizedMacroEnv
-  alias ElixirSense.Core.Compiler.State
 
   defstruct line: false,
             file: nil,

lib/elixir_sense/core/compiler/typespec.ex

@@ -2,6 +2,8 @@ defmodule ElixirSense.Core.Compiler.Typespec do
   alias ElixirSense.Core.Compiler
   alias ElixirSense.Core.Compiler.Utils
   alias ElixirSense.Core.Compiler.State
+  alias ElixirSense.Core.Normalized.Macro.Env, as: NormalizedMacroEnv
+
   def spec_to_signature({:when, _, [spec, _]}), do: type_to_signature(spec)
   def spec_to_signature(other), do: type_to_signature(other)
 
@@ -618,7 +620,27 @@ defmodule ElixirSense.Core.Compiler.Typespec do
     {nil, state}
   end
 
-  defdelegate expand_remote(other, env), to: ElixirSense.Core.Compiler.Macro, as: :expand
+  # 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
+      {:alias, alias} ->
+        alias
+
+      :error ->
+        head = ElixirSense.Core.Compiler.Macro.expand(head, env)
+
+        if is_atom(head) do
+          Module.concat([head | tail])
+        else
+          # elixir raises here
+          alias
+        end
+    end
+  end
+
+  defp expand_remote(other, env), do: ElixirSense.Core.Compiler.Macro.expand(other, env)
 
   defp remote_type({{:., dot_meta, [remote_spec, name_spec]}, meta, args}, vars, caller, state) do
     {args, state} = :lists.mapfoldl(&typespec(&1, vars, caller, &2), state, args)

lib/elixir_sense/core/normalized/macro/env.ex

@@ -25,7 +25,7 @@ defmodule ElixirSense.Core.Normalized.Macro.Env do
         false ->
           allow_locals = Keyword.get(opts, :allow_locals, true)
           trace = Keyword.get(opts, :trace, true)
-          module = env.module
+          # module = env.module
 
           # elixir version passes module.__info__(:macros) as extra, we do not need that
           # instead we override local_for_callback
@@ -638,7 +638,7 @@ defmodule ElixirSense.Core.Normalized.Macro.Env do
       fn args, caller -> expand_macro_fun(meta, fun, receiver, name, args, caller, e) end
     end
 
-    defp expand_macro_fun(_meta, fun, _receiver, name, args, caller, _e) do
+    defp expand_macro_fun(_meta, fun, _receiver, _name, args, caller, _e) do
       # elixir applies local macro via apply/2
       # we need to check if the macro is a function as we return a fake for local macros
       if is_function(fun) do

test/elixir_sense/core/metadata_builder_test.exs

@@ -7578,7 +7578,6 @@ defmodule ElixirSense.Core.MetadataBuilderTest do
 
       assert %{
                2 => [
-                 _,
                  _,
                  %CallInfo{
                    arity: 0,
@@ -7604,7 +7603,6 @@ defmodule ElixirSense.Core.MetadataBuilderTest do
       assert %{
                2 => [
                  %CallInfo{arity: 1, func: :@, position: {2, 3}, mod: Kernel},
-                 %CallInfo{kind: :alias_reference},
                  %CallInfo{
                    arity: 0,
                    func: :t,
@@ -7615,7 +7613,6 @@ defmodule ElixirSense.Core.MetadataBuilderTest do
                ],
                3 => [
                  %CallInfo{arity: 1, func: :@, position: {3, 3}, mod: Kernel},
-                 %CallInfo{kind: :alias_reference},
                  %CallInfo{
                    arity: 0,
                    func: :t,