fix julia-vscode/LanguageServer.jl#320: internal representation of th…

…e Project.toml file has changed in Pkg. (#15)
julia-vscode · Jan 23, 2019 · a7dab3b · a7dab3b
1 parent 16ef158
commit a7dab3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/clientprocess/clientprocess_main.jl b/src/clientprocess/clientprocess_main.jl
@@ -5,8 +5,8 @@ include("from_static_lint.jl")
 
 const storedir = abspath(joinpath(@__DIR__, "..", "..", "store"))
 const c = Pkg.Types.Context()
-const depot = Dict("manifest" => c.env.manifest, 
-                    "installed" => c.env.project["deps"],
+const depot = Dict("manifest" => c.env.manifest,
+                    "installed" => (VERSION < v"1.1.0-DEV.857" ? c.env.project["deps"] : c.env.project.deps),
                     "packages" => Dict{String,Any}())
 
 while true
@@ -19,7 +19,7 @@ while true
         elseif message == :close
             break
         elseif message == :get_installed_packages_in_env
-            pkgs = c.env.project["deps"]
+            pkgs = (VERSION < v"1.1.0-DEV.857" ? c.env.project["deps"] : c.env.project.deps)
             serialize(stdout, (:success, pkgs))
         elseif message == :get_core_packages
             core_pkgs = load_core()["packages"]
@@ -36,12 +36,12 @@ while true
             for  (uuid, pkg) in depot["packages"]
                 SymbolServer.save_store_to_disc(pkg, joinpath(storedir, "$uuid.jstore"))
             end
-            close(outWrite) 
+            close(outWrite)
             close(outRead)
             redirect_stdout(ostdout)
             serialize(stdout, (:success, collect(keys(depot["packages"]))))
         elseif message == :load_all
-            for pkg in c.env.project["deps"]
+            for pkg in (VERSION < v"1.1.0-DEV.857" ? c.env.project["deps"] : c.env.project.deps)
                 SymbolServer.import_package(pkg, depot)
             end
             for  (uuid, pkg) in depot["packages"]

diff --git a/src/clientprocess/from_static_lint.jl b/src/clientprocess/from_static_lint.jl
@@ -142,9 +142,9 @@ end
 
 
 function load_core()
-    c = Pkg.Types.Context()    
-    depot = Dict("manifest" => c.env.manifest, 
-                 "installed" => c.env.project["deps"],
+    c = Pkg.Types.Context()
+    depot = Dict("manifest" => c.env.manifest,
+                 "installed" => (VERSION < v"1.1.0-DEV.857" ? c.env.project["deps"] : c.env.project.deps),
                  "packages" => Dict{String,Any}("Base" => ModuleStore("Base"), "Core" => ModuleStore("Core")))
 
     load_module(Base, "Base"=>"Base", depot, depot["packages"]["Base"])