Only raise on conflicts coming from functions

Author: José Valim

lib/elixir/lib/module/locals_tracker.ex

@@ -145,6 +145,7 @@ defmodule Module.LocalsTracker do
     d = :gen_server.call(pid, :digraph, @timeout)
 
     lc { name, arity } inlist all_defined,
+       :digraph.in_neighbours(d, { :import, name, arity }) != [],
        n = :digraph.out_neighbours(d, { :import, name, arity }),
        n != [] do
       { n, name, arity }

lib/elixir/test/elixir/kernel/errors_test.exs

@@ -242,7 +242,7 @@ defmodule Kernel.ErrorsTest do
       "nofile:1: imported Kernel.&&/2 conflicts with local function",
       '''
       defmodule ErrorsTest do
-        1 && 2
+        def other, do: 1 && 2
         def _ && _, do: :error
       end
       '''

lib/elixir/test/elixir/module/locals_tracker_test.exs

@@ -144,7 +144,12 @@ defmodule Module.LocalsTrackerTest do
   test "find import conflicts", config do
     refute { [Module], :conflict, 1 } in D.collect_imports_conflicts(config[:pid], [conflict: 1])
 
+    # Calls outside local functions are not triggered
     D.add_import(config[:pid], nil, Module, { :conflict, 1 })
+    refute { [Module], :conflict, 1 } in D.collect_imports_conflicts(config[:pid], [conflict: 1])
+
+    D.add_local(config[:pid], { :foo, 2 })
+    D.add_import(config[:pid], { :foo, 2 }, Module, { :conflict, 1 })
     assert { [Module], :conflict, 1 } in D.collect_imports_conflicts(config[:pid], [conflict: 1])
   end
 end