Merge pull request #300 from julia-vscode/sp/rm-pkgentry

fix: don't depend on PkgEntry for empty dicts in get_general_pkgs

Author: pfitzseb

src/SymbolServer.jl

@@ -43,15 +43,15 @@ function get_general_pkgs()
         @static if VERSION >= v"1.7-"
             regs = Pkg.Types.Context().registries
             i = findfirst(r -> r.name == "General" && r.uuid == GENERAL_REGISTRY_UUID, regs)
-            i === nothing && return Dict{UUID, PkgEntry}()
+            i === nothing && return Dict()
             return regs[i].pkgs
         else
             for r in Pkg.Types.collect_registries()
                 (r.name == "General" && r.uuid == GENERAL_REGISTRY_UUID) || continue
                 reg = Pkg.Types.read_registry(joinpath(r.path, "Registry.toml"))
                 return reg["packages"]
             end
-            return Dict{UUID, PkgEntry}()
+            return Dict()
         end
     finally
         append!(empty!(Base.DEPOT_PATH), dp_before)

src/utils.jl

@@ -628,13 +628,13 @@ function load_package(c::Pkg.Types.Context, uuid, conn, loadingbay, percentage =
     if pid in keys(Base.loaded_modules)
         conn !== nothing && println(conn, "PROCESSPKG;$pe_name;$uuid;noversion;$percentage")
         loadingbay.eval(:($(Symbol(pe_name)) = $(Base.loaded_modules[pid])))
-        m = invokelatest(() -> getfield(loadingbay, Symbol(pe_name)))
+        m = Base.invokelatest(() -> getfield(loadingbay, Symbol(pe_name)))
     else
         m = try
             conn !== nothing && println(conn, "STARTLOAD;$pe_name;$uuid;noversion;$percentage")
             loadingbay.eval(:(import $(Symbol(pe_name))))
             conn !== nothing && println(conn, "STOPLOAD;$pe_name")
-            m = invokelatest(() -> getfield(loadingbay, Symbol(pe_name)))
+            m = Base.invokelatest(() -> getfield(loadingbay, Symbol(pe_name)))
         catch
             return
         end