handle cursor in more places

Author: lukaszsamson

lib/elixir_sense/core/compiler.ex

@@ -871,6 +871,19 @@ defmodule ElixirSense.Core.Compiler do
               {expanded_fun, state, _} = expand(fun, state, %{env | function: fa})
               {expanded_fun, state}
 
+            # sometimes cursor turns the AST around and transforms function head node into a 2-tuple
+            {{:__cursor__, cursor_meta, [{fun, _, context}]}, meta, args}
+            when (is_atom(fun) and is_atom(context) and is_list(args)) or is_atom(args) ->
+              fa = {fun, if(is_list(args), do: length(args), else: 0)}
+
+              {expanded_fun, state, _} =
+                expand({:__cursor__, cursor_meta, [{fun, meta, args}]}, state, %{
+                  env
+                  | function: fa
+                })
+
+              {expanded_fun, state}
+
             _ ->
               {fun, state}
           end
@@ -1065,11 +1078,12 @@ defmodule ElixirSense.Core.Compiler do
 
     {arg, state, env} = expand(arg, state, env)
 
-    state = if Keyword.keyword?(arg) do
-      State.register_optional_callbacks(state, arg)
-    else
-      state
-    end
+    state =
+      if Keyword.keyword?(arg) do
+        State.register_optional_callbacks(state, arg)
+      else
+        state
+      end
 
     {{:@, meta, [{:optional_callbacks, doc_meta, [arg]}]}, state, env}
   end
@@ -1719,6 +1733,19 @@ defmodule ElixirSense.Core.Compiler do
           {expanded_call, state, _} = expand(call, state, %{env | function: fa})
           {expanded_call, state}
 
+        # sometimes cursor turns the AST around and transforms function head node into a 2-tuple
+        {{:__cursor__, cursor_meta, [{fun, _, context}]}, meta, args}
+        when (is_atom(fun) and is_atom(context) and is_list(args)) or is_atom(args) ->
+          fa = {fun, if(is_list(args), do: length(args), else: 0)}
+
+          {expanded_call, state, _} =
+            expand({:__cursor__, cursor_meta, [{fun, meta, args}]}, state, %{
+              env
+              | function: fa
+            })
+
+          {expanded_call, state}
+
         _ ->
           {call, state}
       end

lib/elixir_sense/core/compiler/typespec.ex

@@ -21,10 +21,16 @@ defmodule ElixirSense.Core.Compiler.Typespec do
     end
   end
 
+  def type_to_signature({:"::", _, [{{:__cursor__, _, [{n, _, context}]}, _, a}, _]})
+      when (is_atom(n) and is_atom(context) and is_list(a)) or is_atom(a) do
+    {n, if(is_list(a), do: a, else: [])}
+  end
+
   def type_to_signature({:"::", _, [{name, _, args}, _]})
       when is_atom(name) and name != :"::",
       do: {name, args}
 
+  # this may not be needed
   def type_to_signature({:__cursor__, _, args}) when is_list(args) do
     case args do
       [{n, _, a} | _] ->
@@ -36,6 +42,12 @@ defmodule ElixirSense.Core.Compiler.Typespec do
     end
   end
 
+  # this may not be needed
+  def type_to_signature({{:__cursor__, _, [{n, _, context}]}, _, a})
+      when (is_atom(n) and is_atom(context) and is_list(a)) or is_atom(a) do
+    {n, if(is_list(a), do: a, else: [])}
+  end
+
   def type_to_signature({name, _, args}) when is_atom(name) and name != :"::" do
     # elixir returns :error here, we handle incomplete signatures
     {name, args}