6 files changed, 68 insertions, 42 deletions

diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index e1493bdaa..ad6b52371 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -59,6 +59,9 @@ impl FileResolverImp {
     pub(crate) fn resolve(&self, file_id: FileId, path: &RelativePath) -> Option<FileId> {
         self.inner.resolve(file_id, path)
     }
+    pub(crate) fn debug_path(&self, file_id: FileId) -> Option<std::path::PathBuf> {
+        self.inner.debug_path(file_id)
+    }
     fn inner(&self) -> *const FileResolver {
         &*self.inner
     }
@@ -138,6 +141,11 @@ impl AnalysisHostImpl {
                 let mut files = FxHashSet::default();
                 for (file_id, text) in library.files {
                     files.insert(file_id);
+                    log::debug!(
+                        "library file: {:?} {:?}",
+                        file_id,
+                        library.file_resolver.debug_path(file_id)
+                    );
                     self.db
                         .query_mut(crate::input::FileSourceRootQuery)
                         .set_constant(file_id, source_root_id);
diff --git a/crates/ra_analysis/src/input.rs b/crates/ra_analysis/src/input.rs
index ba8a17fd5..a78b6e397 100644
--- a/crates/ra_analysis/src/input.rs
+++ b/crates/ra_analysis/src/input.rs
@@ -33,6 +33,9 @@ impl CrateGraph {
 pub trait FileResolver: fmt::Debug + Send + Sync + 'static {
     fn file_stem(&self, file_id: FileId) -> String;
     fn resolve(&self, file_id: FileId, path: &RelativePath) -> Option<FileId>;
+    fn debug_path(&self, _file_id: FileId) -> Option<std::path::PathBuf> {
+        None
+    }
 }
 
 salsa::query_group! {
diff --git a/crates/ra_lsp_server/src/main_loop/mod.rs b/crates/ra_lsp_server/src/main_loop/mod.rs
index 78d93741a..36f08be2f 100644
--- a/crates/ra_lsp_server/src/main_loop/mod.rs
+++ b/crates/ra_lsp_server/src/main_loop/mod.rs
@@ -168,9 +168,35 @@ fn main_loop_inner(
                     let workspaces = vec![ws];
                     feedback(internal_mode, "workspace loaded", msg_sender);
                     for ws in workspaces.iter() {
-                        for pkg in ws.packages().filter(|pkg| !pkg.is_member(ws)) {
-                            debug!("sending root, {}", pkg.root(ws).to_path_buf().display());
-                            fs_worker.send(pkg.root(ws).to_path_buf());
+                        // Add each library as constant input. If library is
+                        // within the workspace, don't treat it as a library.
+                        //
+                        // HACK: If source roots are nested, pick the outer one.
+
+                        let mut roots = ws
+                            .packages()
+                            .filter(|pkg| !pkg.is_member(ws))
+                            .filter_map(|pkg| {
+                                let root = pkg.root(ws).to_path_buf();
+                                if root.starts_with(&ws_root) {
+                                    None
+                                } else {
+                                    Some(root)
+                                }
+                            })
+                            .collect::<Vec<_>>();
+                        roots.sort_by_key(|it| it.as_os_str().len());
+                        let unique = roots
+                            .iter()
+                            .enumerate()
+                            .filter(|&(idx, long)| {
+                                !roots[..idx].iter().any(|short| long.starts_with(short))
+                            })
+                            .map(|(_idx, root)| root);
+
+                        for root in unique {
+                            debug!("sending root, {}", root.display());
+                            fs_worker.send(root.to_owned());
                         }
                     }
                     state.set_workspaces(workspaces);
diff --git a/crates/ra_lsp_server/src/path_map.rs b/crates/ra_lsp_server/src/path_map.rs
index 87eabf9be..a624043d8 100644
--- a/crates/ra_lsp_server/src/path_map.rs
+++ b/crates/ra_lsp_server/src/path_map.rs
@@ -79,6 +79,10 @@ impl FileResolver for PathMap {
         let path = normalize(&path);
         self.get_id(&path)
     }
+
+    fn debug_path(&self, file_id: FileId) -> Option<PathBuf> {
+        Some(self.get_path(file_id).to_owned())
+    }
 }
 
 fn normalize(path: &Path) -> PathBuf {
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index fe304623f..530a6f77d 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -527,8 +527,7 @@
         "duplexer": {
             "version": "0.1.1",
             "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-            "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-            "dev": true
+            "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
         },
         "duplexify": {
             "version": "3.6.0",
@@ -587,18 +586,16 @@
             "dev": true
         },
         "event-stream": {
-            "version": "3.3.6",
-            "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz",
-            "integrity": "sha512-dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==",
-            "dev": true,
+            "version": "3.3.4",
+            "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+            "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
             "requires": {
                 "duplexer": "0.1.1",
-                "flatmap-stream": "0.1.0",
                 "from": "0.1.7",
-                "map-stream": "0.0.7",
+                "map-stream": "0.1.0",
                 "pause-stream": "0.0.11",
-                "split": "1.0.1",
-                "stream-combiner": "0.2.2",
+                "split": "0.3.3",
+                "stream-combiner": "0.0.4",
                 "through": "2.3.8"
             }
         },
@@ -704,12 +701,6 @@
             "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
             "dev": true
         },
-        "flatmap-stream": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.0.tgz",
-            "integrity": "sha512-Nlic4ZRYxikqnK5rj3YoxDVKGGtUjcNDUtvQ7XsdGLZmMwdUYnXf10o1zcXtzEZTBgc6GxeRpQxV/Wu3WPIIHA==",
-            "dev": true
-        },
         "for-in": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -745,8 +736,7 @@
         "from": {
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-            "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-            "dev": true
+            "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4="
         },
         "fs.realpath": {
             "version": "1.0.0",
@@ -986,7 +976,7 @@
             "integrity": "sha512-/9vtSk9eI9DEWCqzGieglPqmx0WUQ9pwPHyHFpKmfxqdgqGJC2l0vFMdYs54hLdDsMDEZFLDL2J4ikjc4hQ5HQ==",
             "dev": true,
             "requires": {
-                "event-stream": "3.3.6",
+                "event-stream": "3.3.4",
                 "node.extend": "1.1.6",
                 "request": "2.88.0",
                 "through2": "2.0.3",
@@ -1065,7 +1055,7 @@
             "integrity": "sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=",
             "dev": true,
             "requires": {
-                "event-stream": "3.3.6",
+                "event-stream": "3.3.4",
                 "mkdirp": "0.5.1",
                 "queue": "3.1.0",
                 "vinyl-fs": "2.4.4"
@@ -1077,7 +1067,7 @@
             "integrity": "sha512-0QfbCH2a1k2qkTLWPqTX+QO4qNsHn3kC546YhAP3/n0h+nvtyGITDuDrYBMDZeW4WnFijmkOvBWa5HshTic1tw==",
             "dev": true,
             "requires": {
-                "event-stream": "3.3.6",
+                "event-stream": "3.3.4",
                 "streamifier": "0.1.1",
                 "tar": "2.2.1",
                 "through2": "2.0.3",
@@ -1115,7 +1105,7 @@
             "integrity": "sha1-JOQGhdwFtxSZlSRQmeBZAmO+ja0=",
             "dev": true,
             "requires": {
-                "event-stream": "3.3.6",
+                "event-stream": "3.3.4",
                 "queue": "4.5.0",
                 "through2": "2.0.3",
                 "vinyl": "2.2.0",
@@ -1475,10 +1465,9 @@
             "dev": true
         },
         "map-stream": {
-            "version": "0.0.7",
-            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-            "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-            "dev": true
+            "version": "0.1.0",
+            "resolved": "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+            "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ="
         },
         "markdown-it": {
             "version": "8.4.2",
@@ -1838,7 +1827,6 @@
             "version": "0.0.11",
             "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
             "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-            "dev": true,
             "requires": {
                 "through": "2.3.8"
             }
@@ -2093,10 +2081,9 @@
             }
         },
         "split": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-            "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-            "dev": true,
+            "version": "0.3.3",
+            "resolved": "http://registry.npmjs.org/split/-/split-0.3.3.tgz",
+            "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
             "requires": {
                 "through": "2.3.8"
             }
@@ -2131,13 +2118,11 @@
             "dev": true
         },
         "stream-combiner": {
-            "version": "0.2.2",
-            "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-            "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-            "dev": true,
+            "version": "0.0.4",
+            "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+            "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
             "requires": {
-                "duplexer": "0.1.1",
-                "through": "2.3.8"
+                "duplexer": "0.1.1"
             }
         },
         "stream-shift": {
@@ -2221,8 +2206,7 @@
         "through": {
             "version": "2.3.8",
             "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-            "dev": true
+            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
         },
         "through2": {
             "version": "2.0.3",
diff --git a/editors/code/package.json b/editors/code/package.json
index ea84a1ccb..f3b049e43 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -28,6 +28,7 @@
         "singleQuote": true
     },
     "dependencies": {
+        "event-stream": "^3.3.4",
         "vscode-languageclient": "^5.1.1"
     },
     "devDependencies": {