improve handling of nodes wrapped in cursor

Author: lukaszsamson

lib/elixir_sense/core/compiler.ex

@@ -855,6 +855,25 @@ defmodule ElixirSense.Core.Compiler do
       |> Enum.reduce(state, fn fun, state ->
         state_orig = state
 
+        {fun, state} =
+          case fun do
+            {:__cursor__, _, list} when is_list(list) ->
+              fa =
+                case list do
+                  [{f, _, a} | _] ->
+                    {f, length(a || [])}
+
+                  _ ->
+                    {:__unknown__, 0}
+                end
+
+              {expanded_fun, state, _} = expand(fun, state, %{env | function: fa})
+              {expanded_fun, state}
+
+            _ ->
+              {fun, state}
+          end
+
         {fun, state, has_unquotes} =
           if __MODULE__.Quote.has_unquotes(fun) do
             state = State.new_vars_scope(state)
@@ -1682,14 +1701,23 @@ defmodule ElixirSense.Core.Compiler do
        )
        when module != nil and
               def_kind in [:def, :defp, :defmacro, :defmacrop, :defguard, :defguardp] do
-    state =
+    {call, state} =
       case call do
         {:__cursor__, _, list} when is_list(list) ->
-          {_, state, _} = expand(call, state, %{env | function: {:__unknown__, 0}})
-          state
+          fa =
+            case list do
+              [{f, _, a} | _] ->
+                {f, length(a || [])}
+
+              _ ->
+                {:__unknown__, 0}
+            end
+
+          {expanded_call, state, _} = expand(call, state, %{env | function: fa})
+          {expanded_call, state}
 
         _ ->
-          state
+          {call, state}
       end
 
     state_orig = state

lib/elixir_sense/core/compiler/typespec.ex

@@ -11,17 +11,29 @@ defmodule ElixirSense.Core.Compiler.Typespec do
 
   def type_to_signature({:"::", _, [{:__cursor__, _, args}, _]})
       when is_list(args) do
-    # type name replaced by cursor
-    {:__unknown__, []}
+    case args do
+      [{n, _, a} | _] ->
+        {n, a || []}
+
+      _ ->
+        # type name replaced by cursor
+        {:__unknown__, []}
+    end
   end
 
   def type_to_signature({:"::", _, [{name, _, args}, _]})
       when is_atom(name) and name != :"::",
       do: {name, args}
 
   def type_to_signature({:__cursor__, _, args}) when is_list(args) do
-    # type name replaced by cursor
-    {:__unknown__, []}
+    case args do
+      [{n, _, a} | _] ->
+        {n, a || []}
+
+      _ ->
+        # type name replaced by cursor
+        {:__unknown__, []}
+    end
   end
 
   def type_to_signature({name, _, args}) when is_atom(name) and name != :"::" do

lib/elixir_sense/core/source.ex

@@ -504,7 +504,7 @@ defmodule ElixirSense.Core.Source do
 
   defp find_cursor_in_params(params, call, meta) do
     case Enum.reverse(params) do
-      [{:__cursor__, _, []} | rest] ->
+      [{:__cursor__, _, list} | rest] when is_list(list) ->
         {:ok,
          %{
            call: call,
@@ -518,7 +518,7 @@ defmodule ElixirSense.Core.Source do
 
       [keyword_list | rest] when is_list(keyword_list) ->
         case Enum.reverse(keyword_list) do
-          [{:__cursor__, _, []} | kl_rest] ->
+          [{:__cursor__, _, list} | kl_rest] when is_list(list) ->
             {:ok,
              %{
                call: call,
@@ -530,7 +530,7 @@ defmodule ElixirSense.Core.Source do
                option: nil
              }}
 
-          [{atom, {:__cursor__, _, []}} | kl_rest] when is_atom(atom) ->
+          [{atom, {:__cursor__, _, list}} | kl_rest] when is_atom(atom) and is_list(list) ->
             {:ok,
              %{
                call: call,

lib/elixir_sense/providers/plugins/phoenix/scope.ex

@@ -16,7 +16,7 @@ defmodule ElixirSense.Providers.Plugins.Phoenix.Scope do
   end
 
   defp get_scopes(ast) do
-    path = Macro.path(ast, &match?({:__cursor__, _, _}, &1))
+    path = Macro.path(ast, &match?({:__cursor__, _, list} when is_list(list), &1))
 
     scopes =
       path