Merge pull request #301 from julia-vscode/sp/misc-fixes

fix: adjust jl_module_names ccall

Author: pfitzseb

src/faketypes.jl

@@ -76,8 +76,8 @@ function _parameter(@nospecialize(p))
     end
 end
 
-Base.print(io::IO, vr::VarRef) = vr.parent === nothing ? print(io, vr.name) : print(io, vr.parent, ".", vr.name)
-function Base.print(io::IO, tn::FakeTypeName)
+Base.show(io::IO, vr::VarRef) = vr.parent === nothing ? print(io, vr.name) : print(io, vr.parent, ".", vr.name)
+function Base.show(io::IO, tn::FakeTypeName)
     print(io, tn.name)
     if !isempty(tn.parameters)
         print(io, "{")
@@ -88,17 +88,17 @@ function Base.print(io::IO, tn::FakeTypeName)
         print(io, "}")
     end
 end
-Base.print(io::IO, x::FakeUnionAll) = print(io, x.body, " where ", x.var)
-function Base.print(io::IO, x::FakeUnion; inunion=false)
-    !inunion && print(io,  "Union{")
+Base.show(io::IO, x::FakeUnionAll) = print(io, x.body, " where ", x.var)
+function Base.show(io::IO, x::FakeUnion; inunion=false)
+    !inunion && print(io, "Union{")
     print(io, x.a, ",")
     if x.b isa FakeUnion
-        print(io, x.b, inunion=true)
+        Base.show(io, x.b; inunion=true)
     else
         print(io, x.b, "}")
     end
 end
-function Base.print(io::IO, x::FakeTypeVar)
+function Base.show(io::IO, x::FakeTypeVar)
     if isfakebottom(x.lb)
         if isfakeany(x.ub)
             print(io, x.name)
@@ -126,6 +126,13 @@ Base.:(==)(a::FakeUnionAll, b::FakeUnionAll) = a.var == b.var && a.body == b.bod
 Base.:(==)(a::FakeUnion, b::FakeUnion) = a.a == b.a && a.b == b.b
 Base.:(==)(a::FakeTypeofBottom, b::FakeTypeofBottom) = true
 
+Base.hash(a::FakeTypeName, h::UInt) = hash(a.name, hash(a.parameters, hash(:FakeTypeName, h)))
+Base.hash(a::VarRef, h::UInt) = hash(a.name, hash(a.parent, hash(:VarRef, h)))
+Base.hash(a::FakeTypeVar, h::UInt) = hash(a.name, hash(a.lb, hash(a.ub, hash(:FakeTypeVar, h))))
+Base.hash(a::FakeUnionAll, h::UInt) = hash(a.var, hash(a.body, hash(:FakeUnionAll, h)))
+Base.hash(a::FakeUnion, h::UInt) = hash(a.a, hash(a.b, hash(:FakeUnion, h)))
+Base.hash(::FakeTypeofBottom, h::UInt) = hash(:FakeTypeofBottom, h)
+
 @static if !(Vararg isa Type)
     struct FakeTypeofVararg
         T

src/symbols.jl

@@ -21,6 +21,8 @@ Base.getindex(m::ModuleStore, k) = m.vals[k]
 Base.setindex!(m::ModuleStore, v, k) = (m.vals[k] = v)
 Base.haskey(m::ModuleStore, k) = haskey(m.vals, k)
 
+Base.show(io::IO, ms::ModuleStore) = print(io, "ModuleStore($(ms.name)) with $(length(ms.vals)) entries")
+
 const EnvStore = Dict{Symbol,ModuleStore}
 
 struct Package
@@ -41,6 +43,14 @@ struct MethodStore
     rt::Any
 end
 
+function Base.show(io::IO, ms::MethodStore)
+    print(io, ms.mod, ".", ms.name, "(")
+    for (a,b) in ms.sig
+        print(io, a, "::", b)
+    end
+    print(io, ") at ", ms.file, ":", ms.line, )
+end
+
 struct DataTypeStore <: SymStore
     name::FakeTypeName
     super::FakeTypeName
@@ -77,6 +87,10 @@ function DataTypeStore(@nospecialize(t), symbol, parent_mod, exported)
     DataTypeStore(FakeTypeName(ur_t), FakeTypeName(ur_t.super), parameters, types, isconcretetype(ur_t) && fieldcount(ur_t) > 0 ? collect(fieldnames(ur_t)) : Symbol[], MethodStore[], _doc(Base.Docs.Binding(parent_mod, symbol)), exported)
 end
 
+function Base.show(io::IO, dts::DataTypeStore)
+    print(io, dts.name, " <: ", dts.super, " with $(length(dts.methods)) methods")
+end
+
 struct FunctionStore <: SymStore
     name::VarRef
     methods::Vector{MethodStore}
@@ -93,6 +107,10 @@ function FunctionStore(@nospecialize(f), symbol, parent_mod, exported)
     end
 end
 
+function Base.show(io::IO, fs::FunctionStore)
+    print(io, fs.name, " with $(length(fs.methods)) methods")
+end
+
 struct GenericStore <: SymStore
     name::VarRef
     typ::Any
@@ -246,7 +264,9 @@ function cache_methods(@nospecialize(f), name, env, get_return_type)
         elseif !(modstore[name] isa DataTypeStore || modstore[name] isa FunctionStore)
             modstore[name] = FunctionStore(VarRef(mvr, name), MethodStore[m[2]], "", func_vr, false)
         else
-            push!(modstore[name].methods, m[2])
+            if !(m[2] in modstore[name].methods)
+                push!(modstore[name].methods, m[2])
+            end
         end
     end
     return ms
@@ -273,7 +293,7 @@ end
 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, usings = true)
             (!isdefined(m, s) || s == nameof(m)) && continue
             x = getfield(m, s)
             f(x)
@@ -294,7 +314,7 @@ 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, imported = true)
+        for s in unsorted_names(m, all = true, imported = true, usings = true)
             !isdefined(m, s) && continue
             x = getfield(m, s)
             state = f(m, s, x, state)
@@ -363,7 +383,7 @@ istoplevelmodule(m) = parentmodule(m) === m || parentmodule(m) === Main
 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, usings = true)
         !isdefined(m, s) && continue
         x = getfield(m, s)
         if x isa Module
@@ -401,7 +421,7 @@ end
 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)
+    ns = unsorted_names(m; all = true, imported = false, usings = false)
     for n in ns
         isdefined(m, n) || continue
         Base.isdeprecated(m, n) && continue
@@ -416,6 +436,11 @@ function all_names(m, pred, symbols = Set(Symbol[]), seen = Set(Module[]))
     symbols
 end
 
+# On 1.12, names() includes bindings from Core in Base even not requested,
+# so we filter those out below. This could also be a version check, but doing it
+# this way should be more robust
+const CORE_BASE_NAMES_CONFUSION = :Bool in names(Base)
+
 function symbols(env::EnvStore, m::Union{Module,Nothing} = nothing, allnames::Base.IdSet{Symbol} = getallns(), visited = Base.IdSet{Module}();  get_return_type = false)
     if m isa Module
         cache = _lookup(VarRef(m), env, true)
@@ -425,8 +450,13 @@ function symbols(env::EnvStore, m::Union{Module,Nothing} = nothing, allnames::Ba
         for s in ns
             !isdefined(m, s) && continue
             x = getfield(m, s)
+
+            if CORE_BASE_NAMES_CONFUSION && m === Base && isdefined(Core, s) && getfield(Core, s) === x
+                continue
+            end
+
             if Base.unwrap_unionall(x) isa DataType # Unions aren't handled here.
-                if parentmodule((x)) === m
+                if parentmodule(x) === m
                     cache[s] = DataTypeStore(x, s, m, s in getnames(m))
                     cache_methods(x, s, env, get_return_type)
                 elseif nameof(x) !== s

src/utils.jl

@@ -341,8 +341,13 @@ extends_methods(f::FunctionStore) = f.name != f.extends
 get_top_module(vr::VarRef) = vr.parent === nothing ? vr.name : get_top_module(vr.parent)
 
 # Sorting is the main performance of calling `names`
-unsorted_names(m::Module; all::Bool=false, imported::Bool=false) =
-    ccall(:jl_module_names, Array{Symbol,1}, (Any, Cint, Cint), m, all, imported)
+@static if VERSION < v"1.12-"
+    unsorted_names(m::Module; all::Bool=false, imported::Bool=false, usings=false) =
+        ccall(:jl_module_names, Array{Symbol,1}, (Any, Cint, Cint), m, all, imported)
+else
+    unsorted_names(m::Module; all::Bool=false, imported::Bool=false, usings=false) =
+         ccall(:jl_module_names, Array{Symbol,1}, (Any, Cint, Cint, Cint), m, all, imported, usings)
+end
 
 ## recursive_copy
 #

test/runtests.jl

@@ -4,11 +4,14 @@ using Base: UUID
 using Test
 
 allns = SymbolServer.getallns()
-function missingsymbols(m::Module, cache::SymbolServer.ModuleStore, env)
+function missingsymbols(m::Module, cache::SymbolServer.ModuleStore, env; excludecore = false)
     notfound = Symbol[]
     notfoundhidden = Symbol[]
     for n in names(m, all=true)
         if isdefined(m, n) && !haskey(cache.vals, n)
+            if excludecore && isdefined(Core, n)
+                continue
+            end
             push!(notfound, n)
         end
     end
@@ -67,8 +70,17 @@ end
     SymbolServer.symbols(env)
     r = missingsymbols(Core, env[:Core], env)
     @test length.(r) == (0, 0)
-    r = missingsymbols(Base, env[:Base], env)
-    @test length.(r) == (0, 0)
+
+    if VERSION >= v"1.12-"
+        # on 1.12, names() includes bindings from Core in Base even not requested,
+        # so we filter those out here
+        r = missingsymbols(Base, env[:Base], env; excludecore = true)
+        @test length.(r) == (0, 0)
+    else
+        r = missingsymbols(Base, env[:Base], env)
+        @test length.(r) == (0, 0)
+    end
+
     @testset "VarRef loops" begin
         check_varrefs(env)
     end