2 files changed, 13 insertions, 16 deletions

diff --git a/crates/ra_lsp_server/src/cargo_target_spec.rs b/crates/ra_lsp_server/src/cargo_target_spec.rs
index e011eab7c..cdf2ec10b 100644
--- a/crates/ra_lsp_server/src/cargo_target_spec.rs
+++ b/crates/ra_lsp_server/src/cargo_target_spec.rs
@@ -1,5 +1,5 @@
 use crate::{
-    project_model::TargetKind,
+    project_model::{self, TargetKind},
     server_world::ServerWorld,
     Result
 };
@@ -65,14 +65,16 @@ impl CargoTargetSpec {
         };
         let file_id = world.analysis().crate_root(crate_id)?;
         let path = world.vfs.read().file2path(ra_vfs::VfsFile(file_id.0.into()));
-        let res = world.workspaces.iter().find_map(|ws| {
-            let tgt = ws.cargo.target_by_root(&path)?;
-            let res = CargoTargetSpec {
-                package: tgt.package(&ws.cargo).name(&ws.cargo).to_string(),
-                target: tgt.name(&ws.cargo).to_string(),
-                target_kind: tgt.kind(&ws.cargo),
-            };
-            Some(res)
+        let res = world.workspaces.iter().find_map(|ws| match ws {
+            project_model::ProjectWorkspace::Cargo { cargo, .. } => {
+                let tgt = cargo.target_by_root(&path)?;
+                Some(CargoTargetSpec {
+                    package: tgt.package(&cargo).name(&cargo).to_string(),
+                    target: tgt.name(&cargo).to_string(),
+                    target_kind: tgt.kind(&cargo),
+                })
+            }
+            project_model::ProjectWorkspace::Json { .. } => None,
         });
         Ok(res)
     }
diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs
index 4a68c019f..7163568b9 100644
--- a/crates/ra_lsp_server/src/server_world.rs
+++ b/crates/ra_lsp_server/src/server_world.rs
@@ -40,12 +40,7 @@ impl ServerWorldState {
         let mut roots = Vec::new();
         roots.push(root.clone());
         for ws in workspaces.iter() {
-            for pkg in ws.cargo.packages() {
-                roots.push(pkg.root(&ws.cargo).to_path_buf());
-            }
-            for krate in ws.sysroot.crates() {
-                roots.push(krate.root_dir(&ws.sysroot).to_path_buf())
-            }
+            roots.extend(ws.to_roots());
         }
         let (mut vfs, roots) = Vfs::new(roots);
         let roots_to_scan = roots.len();
@@ -185,7 +180,7 @@ impl ServerWorld {
         } else {
             res.push_str("workspaces:\n");
             for w in self.workspaces.iter() {
-                res += &format!("{} packages loaded\n", w.cargo.packages().count());
+                res += &format!("{} packages loaded\n", w.count());
             }
         }
         res.push_str("\nanalysis:\n");