7 files changed, 71 insertions, 42 deletions

diff --git a/crates/ra_lsp_server/src/caps.rs b/crates/ra_lsp_server/src/caps.rs
index bcf857fce..560f64989 100644
--- a/crates/ra_lsp_server/src/caps.rs
+++ b/crates/ra_lsp_server/src/caps.rs
@@ -19,7 +19,7 @@ pub fn server_capabilities() -> ServerCapabilities {
         hover_provider: Some(true),
         completion_provider: Some(CompletionOptions {
             resolve_provider: None,
-            trigger_characters: None,
+            trigger_characters: Some(vec![":".to_string()]),
         }),
         signature_help_provider: Some(SignatureHelpOptions {
             trigger_characters: Some(vec!["(".to_string(), ",".to_string(), ")".to_string()]),
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index e5a2449c2..28368787c 100644
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -49,10 +49,9 @@ impl ConvWith for Position {
     type Output = TextUnit;
 
     fn conv_with(self, line_index: &LineIndex) -> TextUnit {
-        // TODO: UTF-16
         let line_col = LineCol {
             line: self.line as u32,
-            col: (self.character as u32).into(),
+            col_utf16: self.character as u32,
         };
         line_index.offset(line_col)
     }
@@ -64,8 +63,7 @@ impl ConvWith for TextUnit {
 
     fn conv_with(self, line_index: &LineIndex) -> Position {
         let line_col = line_index.line_col(self);
-        // TODO: UTF-16
-        Position::new(u64::from(line_col.line), u64::from(u32::from(line_col.col)))
+        Position::new(u64::from(line_col.line), u64::from(line_col.col_utf16))
     }
 }
 
@@ -204,7 +202,7 @@ impl TryConvWith for SourceChange {
                     .unwrap_or(&[]);
                 let line_col = translate_offset_with_edit(&*line_index, pos.offset, edits);
                 let position =
-                    Position::new(u64::from(line_col.line), u64::from(u32::from(line_col.col)));
+                    Position::new(u64::from(line_col.line), u64::from(line_col.col_utf16));
                 Some(TextDocumentPositionParams {
                     text_document: TextDocumentIdentifier::new(pos.file_id.try_conv_with(world)?),
                     position,
@@ -247,12 +245,12 @@ fn translate_offset_with_edit(
     if in_edit_line_col.line == 0 {
         LineCol {
             line: edit_line_col.line,
-            col: edit_line_col.col + in_edit_line_col.col,
+            col_utf16: edit_line_col.col_utf16 + in_edit_line_col.col_utf16,
         }
     } else {
         LineCol {
             line: edit_line_col.line + in_edit_line_col.line,
-            col: in_edit_line_col.col,
+            col_utf16: in_edit_line_col.col_utf16,
         }
     }
 }
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs
index 26bcddd8e..8301a1044 100644
--- a/crates/ra_lsp_server/src/main.rs
+++ b/crates/ra_lsp_server/src/main.rs
@@ -65,27 +65,3 @@ fn main_inner() -> Result<()> {
     info!("... IO is down");
     Ok(())
 }
-
-/*
-                    (let ((backend (eglot-xref-backend)))
-                      (mapcar
-                       (lambda (xref)
-                         (let ((loc (xref-item-location xref)))
-                           (propertize
-                            (concat
-                             (when (xref-file-location-p loc)
-                               (with-slots (file line column) loc
-                                 (format "%s:%s:%s:"
-                                         (propertize (file-relative-name file)
-                                                     'face 'compilation-info)
-                                         (propertize (format "%s" line)
-                                                     'face 'compilation-line
-                                                     )
-                                         column)))
-                             (xref-item-summary xref))
-                            'xref xref)))
-                       (xref-backend-apropos backend "Analysis"))
-                      )
-
-
-*/
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index c872b0dc4..6d5622b15 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -9,7 +9,7 @@ use languageserver_types::{
     WorkspaceEdit, ParameterInformation, SignatureInformation, Hover, HoverContents,
 };
 use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition};
-use ra_syntax::text_utils::contains_offset_nonstrict;
+use ra_syntax::{TextUnit, text_utils::contains_offset_nonstrict};
 use rustc_hash::FxHashMap;
 use serde_json::to_value;
 
@@ -381,6 +381,28 @@ pub fn handle_completion(
         let offset = params.position.conv_with(&line_index);
         FilePosition { file_id, offset }
     };
+    let completion_triggered_after_single_colon = {
+        let mut res = false;
+        if let Some(ctx) = params.context {
+            if ctx.trigger_character.unwrap_or_default() == ":" {
+                let source_file = world.analysis().file_syntax(position.file_id);
+                let syntax = source_file.syntax();
+                let text = syntax.text();
+                if let Some(next_char) = text.char_at(position.offset) {
+                    let diff = TextUnit::of_char(next_char) + TextUnit::of_char(':');
+                    let prev_char = position.offset - diff;
+                    if text.char_at(prev_char) != Some(':') {
+                        res = true;
+                    }
+                }
+            }
+        }
+        res
+    };
+    if completion_triggered_after_single_colon {
+        return Ok(None);
+    }
+
     let items = match world.analysis().completions(position)? {
         None => return Ok(None),
         Some(items) => items,
@@ -545,10 +567,13 @@ pub fn handle_rename(world: ServerWorld, params: RenameParams) -> Result<Option<
     let mut changes = HashMap::new();
     for r in refs {
         if let Ok(loc) = to_location(r.0, r.1, &world, &line_index) {
-            changes.entry(loc.uri).or_insert(Vec::new()).push(TextEdit {
-                range: loc.range,
-                new_text: params.new_name.clone(),
-            });
+            changes
+                .entry(loc.uri)
+                .or_insert_with(Vec::new)
+                .push(TextEdit {
+                    range: loc.range,
+                    new_text: params.new_name.clone(),
+                });
         }
     }
 
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..02e54629c 100644
--- a/crates/ra_lsp_server/src/path_map.rs
+++ b/crates/ra_lsp_server/src/path_map.rs
@@ -43,7 +43,7 @@ impl PathMap {
         (inserted, file_id)
     }
     pub fn get_id(&self, path: &Path) -> Option<FileId> {
-        self.path2id.get(path).map(|&id| id)
+        self.path2id.get(path).cloned()
     }
     pub fn get_path(&self, file_id: FileId) -> &Path {
         self.id2path.get(&file_id).unwrap().as_path()
@@ -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/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs
index 3e7670fcc..12faeb93a 100644
--- a/crates/ra_lsp_server/src/server_world.rs
+++ b/crates/ra_lsp_server/src/server_world.rs
@@ -140,7 +140,7 @@ impl ServerWorldState {
         Ok(file_id)
     }
     pub fn set_workspaces(&mut self, ws: Vec<CargoWorkspace>) {
-        let mut crate_graph = CrateGraph::new();
+        let mut crate_graph = CrateGraph::default();
         ws.iter()
             .flat_map(|ws| {
                 ws.packages()