From 961cae7e53a05625f3e010076673ca083479b481 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 9 Dec 2018 01:02:53 +0300
Subject: thread info about dep names

---
 crates/ra_lsp_server/src/project_model.rs | 19 +++++++++++++++----
 crates/ra_lsp_server/src/server_world.rs  |  4 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'crates/ra_lsp_server')

diff --git a/crates/ra_lsp_server/src/project_model.rs b/crates/ra_lsp_server/src/project_model.rs
index 5da71b9f5..cb91ada90 100644
--- a/crates/ra_lsp_server/src/project_model.rs
+++ b/crates/ra_lsp_server/src/project_model.rs
@@ -34,7 +34,13 @@ struct PackageData {
     manifest: PathBuf,
     targets: Vec<Target>,
     is_member: bool,
-    dependencies: Vec<Package>,
+    dependencies: Vec<PackageDependency>,
+}
+
+#[derive(Debug, Clone)]
+pub struct PackageDependency {
+    pub pkg: Package,
+    pub name: SmolStr,
 }
 
 #[derive(Debug, Clone)]
@@ -68,8 +74,11 @@ impl Package {
     pub fn is_member(self, ws: &CargoWorkspace) -> bool {
         ws.pkg(self).is_member
     }
-    pub fn dependencies<'a>(self, ws: &'a CargoWorkspace) -> impl Iterator<Item = Package> + 'a {
-        ws.pkg(self).dependencies.iter().cloned()
+    pub fn dependencies<'a>(
+        self,
+        ws: &'a CargoWorkspace,
+    ) -> impl Iterator<Item = &'a PackageDependency> + 'a {
+        ws.pkg(self).dependencies.iter()
     }
 }
 
@@ -135,7 +144,9 @@ impl CargoWorkspace {
             let source = pkg_by_id[&node.id];
             for id in node.dependencies {
                 let target = pkg_by_id[&id];
-                packages[source.0].dependencies.push(target);
+                let name: SmolStr = packages[target.0].name.replace('-', "_").into();
+                let dep = PackageDependency { name, pkg: target };
+                packages[source.0].dependencies.push(dep);
             }
         }
 
diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs
index f2d602dc7..ab4c2c8aa 100644
--- a/crates/ra_lsp_server/src/server_world.rs
+++ b/crates/ra_lsp_server/src/server_world.rs
@@ -162,9 +162,9 @@ impl ServerWorldState {
             }
             for pkg in ws.packages() {
                 for dep in pkg.dependencies(ws) {
-                    if let Some(&to) = pkg_to_lib_crate.get(&dep) {
+                    if let Some(&to) = pkg_to_lib_crate.get(&dep.pkg) {
                         for &from in pkg_crates.get(&pkg).into_iter().flatten() {
-                            crate_graph.add_dep(from, to);
+                            crate_graph.add_dep(from, dep.name.clone(), to);
                         }
                     }
                 }
-- 
cgit v1.2.3