Fix crash in call hierarchy provider on anonymous function calls

expand attributes and variables

Author: lukaszsamson

apps/language_server/lib/language_server/providers/call_hierarchy/locator.ex

@@ -225,6 +225,10 @@ defmodule ElixirLS.LanguageServer.Providers.CallHierarchy.Locator do
     }
   end
 
+  defp wrap_atom({nil, other}), do: {nil, other}
+  defp wrap_atom({atom, other}) when is_atom(atom), do: {{:atom, atom}, other}
+  defp wrap_atom(other), do: other
+
   defp expand({nil, func}, _env, module, _aliases) when module != nil,
     do: {nil, func}
 
@@ -294,13 +298,50 @@ defmodule ElixirLS.LanguageServer.Providers.CallHierarchy.Locator do
     else
       all_calls = metadata.calls |> Map.values() |> List.flatten()
 
+      mods_funs = metadata.mods_funs_to_positions
+      metadata_types = metadata.types
+
       filtered_calls =
         all_calls
+        # Filter out calls with nil function (anonymous function calls)
+        |> Enum.filter(fn call -> call.func != nil end)
         |> Enum.filter(fn call ->
-          # Check for the specific function, module and arity
-          call.func == function and
-            call.mod == module and
-            (arity == :any or call.arity == arity)
+          # Get environment at call position to expand variables and attributes
+          {call_line, call_column} = call.position
+          env = Metadata.get_cursor_env(metadata, {call_line, call_column || 1})
+
+          binding_env = Binding.from_env(env, metadata, call.position)
+
+          # Determine the module for local calls
+          mod_or_nil =
+            case call.kind do
+              :local_function -> nil
+              :local_macro -> nil
+              _ -> call.mod
+            end
+
+          # Expand variables and attributes to get actual module and function
+          found =
+            {mod_or_nil, call.func}
+            |> wrap_atom
+            |> expand(binding_env, env.module, env.aliases)
+            |> Introspection.actual_mod_fun(
+              env,
+              mods_funs,
+              metadata_types,
+              call.position,
+              false
+            )
+
+          # Check if this call matches our target
+          case found do
+            {^module, ^function, true, :mod_fun} ->
+              # Check arity
+              arity == :any or call.arity == arity
+
+            _ ->
+              false
+          end
         end)
 
       group_calls_by_caller(filtered_calls, metadata)
@@ -500,25 +541,61 @@ defmodule ElixirLS.LanguageServer.Providers.CallHierarchy.Locator do
                 (end_line == nil or call_line <= end_line)
             end)
 
-          # Group by callee
+          # Expand calls to resolve variables and attributes, then group by callee
           calls
-          |> Enum.group_by(fn call ->
-            # For local calls (mod == nil), use the module from the current context
-            callee_mod = call.mod || module
-            {callee_mod, call.func, call.arity}
+          # Filter out calls where func is not an atom (e.g., anonymous functions)
+          # ElixirSense can produce calls where func is a tuple (AST) for anonymous function calls
+          |> Enum.filter(fn call -> is_atom(call.func) end)
+          |> Enum.flat_map(fn call ->
+            # Get environment at call position to expand variables and attributes
+            {call_line, call_column} = call.position
+            env = Metadata.get_cursor_env(metadata, {call_line, call_column || 1})
+
+            binding_env = Binding.from_env(env, metadata, call.position)
+
+            # Expand variables and attributes to get actual module
+            {expanded_mod, expanded_fun} =
+              {call.mod, call.func}
+              |> wrap_atom
+              |> expand(binding_env, env.module, env.aliases)
+
+            # For outgoing calls, include the call if we could expand the module/function
+            # or if it's already a concrete module (even if not in metadata)
+            case {expanded_mod, expanded_fun} do
+              {nil, nil} ->
+                # Couldn't expand - skip this call
+                []
+
+              {actual_mod, actual_fun} when is_atom(actual_mod) and is_atom(actual_fun) ->
+                # Successfully resolved to a module and function
+                [{actual_mod, actual_fun, call.arity, call}]
+
+              {nil, actual_fun} when is_atom(actual_fun) ->
+                # Local call without module - use the module from the function parameter
+                [{module, actual_fun, call.arity, call}]
+
+              _ ->
+                []
+            end
           end)
-          |> Enum.map(fn {{mod, fun, call_arity}, calls} ->
+          |> Enum.group_by(fn {mod, fun, call_arity, _call} ->
+            {mod, fun, call_arity}
+          end)
+          |> Enum.map(fn {{mod, fun, call_arity}, expanded_calls} ->
+            # Extract original calls from the expanded tuples
+            original_calls = Enum.map(expanded_calls, fn {_, _, _, call} -> call end)
+
             %{
               to: %{
                 name: "#{inspect(mod)}.#{fun}/#{call_arity}",
                 kind: GenLSP.Enumerations.SymbolKind.function(),
                 uri: nil,
-                range: build_range_from_call(List.first(calls)),
-                selection_range: build_range_from_call(List.first(calls)),
+                range: build_range_from_call(List.first(original_calls)),
+                selection_range: build_range_from_call(List.first(original_calls)),
                 tags: [],
                 detail: nil
               },
-              from_ranges: Enum.map(calls, &build_range_from_call/1)
+              from_ranges: Enum.map(original_calls, &build_range_from_call/1)
             }
           end)
         else

dep_versions.exs

@@ -1,5 +1,5 @@
 [
-  elixir_sense: "0e6278a48703f065a7bc4c5f9c0575f7836ebe5b",
+  elixir_sense: "bd6c527fee5725250e68d676c1c19a15bf4906c4",
   dialyxir_vendored: "f8f64cfb6797c518294687e7c03ae817bacbc6ee",
   jason_v: "f1c10fa9c445cb9f300266122ef18671054b2330",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",

mix.lock

@@ -2,7 +2,7 @@
   "benchee": {:hex, :benchee, "1.1.0", "f3a43817209a92a1fade36ef36b86e1052627fd8934a8b937ac9ab3a76c43062", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}], "hexpm", "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir_vendored": {:git, "https://github.com/elixir-lsp/dialyxir.git", "f8f64cfb6797c518294687e7c03ae817bacbc6ee", [ref: "f8f64cfb6797c518294687e7c03ae817bacbc6ee"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "0e6278a48703f065a7bc4c5f9c0575f7836ebe5b", [ref: "0e6278a48703f065a7bc4c5f9c0575f7836ebe5b"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "bd6c527fee5725250e68d676c1c19a15bf4906c4", [ref: "bd6c527fee5725250e68d676c1c19a15bf4906c4"]},
   "erl2ex_vendored": {:git, "https://github.com/elixir-lsp/erl2ex.git", "073ac6b9a44282e718b6050c7b27cedf9217a12a", [ref: "073ac6b9a44282e718b6050c7b27cedf9217a12a"]},
   "erlex_vendored": {:git, "https://github.com/elixir-lsp/erlex.git", "c0e448db27bcbb3f369861d13e3b0607ed37048d", [ref: "c0e448db27bcbb3f369861d13e3b0607ed37048d"]},
   "jason_v": {:git, "https://github.com/elixir-lsp/jason.git", "f1c10fa9c445cb9f300266122ef18671054b2330", [ref: "f1c10fa9c445cb9f300266122ef18671054b2330"]},