properly handle locals in binding

Author: lukaszsamson

lib/elixir_sense/core/binding.ex

@@ -13,6 +13,7 @@ defmodule ElixirSense.Core.Binding do
             variables: [],
             attributes: [],
             current_module: nil,
+            function: nil,
             functions: [],
             macros: [],
             specs: %{},
@@ -28,6 +29,7 @@ defmodule ElixirSense.Core.Binding do
       macros: env.macros,
       specs: metadata.specs,
       current_module: env.module,
+      function: env.function,
       types: metadata.types,
       mods_funs: metadata.mods_funs_to_positions
     }
@@ -308,7 +310,13 @@ defmodule ElixirSense.Core.Binding do
         {functions, macros}
         |> Introspection.combine_imports()
 
-      candidate_targets = List.wrap(current_module) ++ combined_imports ++ [Kernel.SpecialForms]
+      candidate_targets =
+        if current_module && env.function do
+          # locals are available only in defs
+          [current_module]
+        else
+          []
+        end ++ combined_imports ++ [Kernel.SpecialForms]
 
       # take first matching
       Enum.find_value(candidate_targets, fn

test/elixir_sense/core/binding_test.exs

@@ -1240,6 +1240,36 @@ defmodule ElixirSense.Core.BindingTest do
                      %VarInfo{version: 1, name: :ref, type: {:local_call, :fun, []}}
                    ],
                    current_module: MyMod,
+                   function: {:some, 0},
+                   specs: %{
+                     {MyMod, :fun, 0} => %SpecInfo{
+                       specs: ["@spec fun() :: %MyMod{}"]
+                     }
+                   },
+                   mods_funs: %{
+                     {MyMod, :fun, 0} => %ModFunInfo{
+                       params: [[]],
+                       type: :defp
+                     }
+                   },
+                   structs: %{
+                     MyMod => %StructInfo{
+                       fields: [abc: nil, __struct__: MyMod]
+                     }
+                   }
+                 }),
+                 {:variable, :ref, 1}
+               )
+
+      assert :none ==
+               Binding.expand(
+                 @env
+                 |> Map.merge(%{
+                   variables: [
+                     %VarInfo{version: 1, name: :ref, type: {:local_call, :fun, []}}
+                   ],
+                   current_module: MyMod,
+                   function: nil,
                    specs: %{
                      {MyMod, :fun, 0} => %SpecInfo{
                        specs: ["@spec fun() :: %MyMod{}"]
@@ -1270,6 +1300,7 @@ defmodule ElixirSense.Core.BindingTest do
                      %VarInfo{version: 1, name: :ref, type: {:local_call, :fun, []}}
                    ],
                    current_module: MyMod,
+                   function: {:some, 0},
                    specs: %{
                      {MyMod, :fun, 0} => %SpecInfo{
                        specs: ["@spec fun() :: t()"]
@@ -1305,6 +1336,7 @@ defmodule ElixirSense.Core.BindingTest do
                      %VarInfo{version: 1, name: :ref, type: {:local_call, :fun, []}}
                    ],
                    current_module: MyMod,
+                   function: {:some, 0},
                    specs: %{
                      {MyMod, :fun, 0} => %SpecInfo{
                        specs: ["@spec fun() :: t()"]
@@ -1443,6 +1475,7 @@ defmodule ElixirSense.Core.BindingTest do
         @env
         |> Map.merge(%{
           current_module: MyMod,
+          function: {:some, 0},
           specs: %{
             {MyMod, :fun, 3} => %SpecInfo{
               specs: ["@spec fun(integer(), integer(), any()) :: %MyMod{}"]