Merge pull request #185 from julia-vscode/sp/improvenamefinding

improved name resolution

Author: pfitzseb

src/symbols.jl

@@ -135,7 +135,7 @@ function maybe_fixup_stdlib_path(path)
 end
 
 const _global_method_cache = IdDict{Any,Vector{Any}}()
-function methodinfo(@nospecialize(f); types=Tuple, world=typemax(UInt))
+function methodinfo(@nospecialize(f); types = Tuple, world = typemax(UInt))
     key = (f, types, world)
     cached = get(_global_method_cache, key, nothing)
     if cached === nothing
@@ -158,7 +158,7 @@ function cache_methods(@nospecialize(f), name, env)
     world = typemax(UInt)
     ms = Tuple{Module,MethodStore}[]
     methods0 = try
-        methodinfo(f; types=types, world=world)
+        methodinfo(f; types = types, world = world)
     catch err
         return ms
     end
@@ -230,10 +230,10 @@ else
     end
 end
 
-function apply_to_everything(f, m=nothing, visited=Base.IdSet{Module}())
+function apply_to_everything(f, m = nothing, visited = Base.IdSet{Module}())
     if m isa Module
         push!(visited, m)
-        for s in unsorted_names(m, all=true, imported=true)
+        for s in unsorted_names(m, all = true, imported = true)
             (!isdefined(m, s) || s == nameof(m)) && continue
             x = getfield(m, s)
             f(x)
@@ -250,11 +250,11 @@ end
 
 
 
-function oneverything(f, m=nothing, visited=Base.IdSet{Module}())
+function oneverything(f, m = nothing, visited = Base.IdSet{Module}())
     if m isa Module
         push!(visited, m)
         state = nothing
-        for s in unsorted_names(m, all=true)
+        for s in unsorted_names(m, all = true, imported = true)
             !isdefined(m, s) && continue
             x = getfield(m, s)
             state = f(m, s, x, state)
@@ -270,7 +270,7 @@ function oneverything(f, m=nothing, visited=Base.IdSet{Module}())
 end
 
 const _global_symbol_cache_by_mod = IdDict{Module,Base.IdSet{Symbol}}()
-function build_namecache(m, s, @nospecialize(x), state::Union{Base.IdSet{Symbol},Nothing}=nothing)
+function build_namecache(m, s, @nospecialize(x), state::Union{Base.IdSet{Symbol},Nothing} = nothing)
     if state === nothing
         state = get(_global_symbol_cache_by_mod, m, nothing)
         if state === nothing
@@ -320,10 +320,10 @@ end
 usedby(outer, inner) = outer !== inner && isdefined(outer, nameof(inner)) && getproperty(outer, nameof(inner)) === inner && all(isdefined(outer, name) || !isdefined(inner, name) for name in unsorted_names(inner))
 istoplevelmodule(m) = parentmodule(m) === m || parentmodule(m) === Main
 
-function getmoduletree(m::Module, amn, visited=Base.IdSet{Module}())
+function getmoduletree(m::Module, amn, visited = Base.IdSet{Module}())
     push!(visited, m)
     cache = ModuleStore(m)
-    for s in unsorted_names(m, all=true, imported=true)
+    for s in unsorted_names(m, all = true, imported = true)
         !isdefined(m, s) && continue
         x = getfield(m, s)
         if x isa Module
@@ -352,18 +352,37 @@ function getmoduletree(m::Module, amn, visited=Base.IdSet{Module}())
     cache
 end
 
-function getenvtree(names=nothing)
+function getenvtree(names = nothing)
     amn = allmodulenames()
     EnvStore(nameof(m) => getmoduletree(m, amn) for m in Base.loaded_modules_array() if names === nothing || nameof(m) in names)
 end
 
-function symbols(env::EnvStore, m::Union{Module,Nothing}=nothing, allnames::Base.IdSet{Symbol}=getallns(), visited=Base.IdSet{Module}())
+# faster and more correct split_module_names
+all_names(m) = all_names(m, x -> isdefined(m, x))
+function all_names(m, pred, symbols = Set(Symbol[]), seen = Set(Module[]))
+    push!(seen, m)
+    ns = unsorted_names(m; all = true, imported = false)
+    for n in ns
+        isdefined(m, n) || continue
+        Base.isdeprecated(m, n) && continue
+        val = getfield(m, n)
+        if val isa Module && !(val in seen)
+            all_names(val, pred, symbols, seen)
+        end
+        if pred(n)
+            push!(symbols, n)
+        end
+    end
+    symbols
+end
+
+function symbols(env::EnvStore, m::Union{Module,Nothing} = nothing, allnames::Base.IdSet{Symbol} = getallns(), visited = Base.IdSet{Module}())
     if m isa Module
         cache = _lookup(VarRef(m), env, true)
         cache === nothing && return
         push!(visited, m)
-        internalnames, othernames = split_module_names(m, allnames)
-        for s in internalnames
+        ns = all_names(m)
+        for s in ns
             !isdefined(m, s) && continue
             x = getfield(m, s)
             if Base.unwrap_unionall(x) isa DataType # Unions aren't handled here.
@@ -409,23 +428,6 @@ function symbols(env::EnvStore, m::Union{Module,Nothing}=nothing, allnames::Base
                 cache[s] = GenericStore(VarRef(VarRef(m), s), FakeTypeName(typeof(x)), _doc(x), s in getnames(m))
             end
         end
-        for s in othernames
-            x = getfield(m, s)
-            if x isa Function
-                if x isa Core.IntrinsicFunction
-                    cache[s] = VarRef(VarRef(Core.Intrinsics), nameof(x))
-                else
-                    cache[s] = VarRef(VarRef(parentmodule(x)), nameof(x))
-                end
-            elseif x isa DataType
-                cache[s] = VarRef(VarRef(parentmodule(x)), nameof(x))
-            elseif x isa Module
-                cache[s] = VarRef(x)
-            else
-                # We'd like to have these as VarRef's but we don't know where they live.
-                cache[s] = GenericStore(VarRef(VarRef(m), s), FakeTypeName(typeof(x)), _doc(x), s in getnames(m))
-            end
-        end
     else
         for m in Base.loaded_modules_array()
             in(m, visited) || symbols(env, m, allnames, visited)
@@ -452,7 +454,7 @@ function load_core()
     cache[:Base][Symbol("@.")] = cache[:Base][Symbol("@__dot__")]
     cache[:Core][:Main] = GenericStore(VarRef(nothing, :Main), FakeTypeName(Module), _doc(Main), true)
     # Add built-ins
-    builtins = Symbol[nameof(getfield(Core, n).instance) for n in unsorted_names(Core, all=true) if isdefined(Core, n) && getfield(Core, n) isa DataType && isdefined(getfield(Core, n), :instance) && getfield(Core, n).instance isa Core.Builtin]
+    builtins = Symbol[nameof(getfield(Core, n).instance) for n in unsorted_names(Core, all = true) if isdefined(Core, n) && getfield(Core, n) isa DataType && isdefined(getfield(Core, n), :instance) && getfield(Core, n).instance isa Core.Builtin]
     cnames = unsorted_names(Core)
     for f in builtins
         if !haskey(cache[:Core], f)
@@ -529,7 +531,7 @@ function load_core()
 end
 
 
-function collect_extended_methods(depot::EnvStore, extendeds=Dict{VarRef,Vector{VarRef}}())
+function collect_extended_methods(depot::EnvStore, extendeds = Dict{VarRef,Vector{VarRef}}())
     for m in depot
         collect_extended_methods(m[2], extendeds, m[2].name)
     end
@@ -578,4 +580,4 @@ function split_module_names(m::Module, allns)
 end
 
 get_all_modules() = let allms = Base.IdSet{Module}(); apply_to_everything(x -> if x isa Module push!(allms, x) end); allms end
-get_used_modules(M, allms=get_all_modules()) = [m for m in allms if usedby(M, m)]
+get_used_modules(M, allms = get_all_modules()) = [m for m in allms if usedby(M, m)]