Merge pull request rust-lang#237 from Xanewok/fill-completion-item-kind-from-racer

Provide CompletionItem.kind for Racer completions

Author: nrc

src/actions/mod.rs

@@ -240,10 +240,7 @@ impl ActionHandler {
             let location = pos_to_racer_location(params.position);
             let results = racer::complete_from_file(file_path, location, &session);
 
-            results.map(|comp| CompletionItem::new_simple(
-                comp.matchstr.clone(),
-                comp.contextstr.clone(),
-            )).collect()
+            results.map(|comp| completion_item_from_racer_match(comp)).collect()
         }).unwrap_or_else(|_| vec![]);
 
         out.success(id, ResponseData::CompletionItems(result));

src/lsp_data.rs

@@ -16,6 +16,7 @@ use analysis::raw;
 use hyper::Url;
 use serde::Serialize;
 use span;
+use racer;
 
 pub use ls_types::*;
 
@@ -122,6 +123,39 @@ pub fn source_kind_from_def_kind(k: raw::DefKind) -> SymbolKind {
     }
 }
 
+pub fn completion_kind_from_match_type(m : racer::MatchType) -> CompletionItemKind {
+    match m {
+        racer::MatchType::Crate |
+        racer::MatchType::Module => CompletionItemKind::Module,
+        racer::MatchType::Struct => CompletionItemKind::Class,
+        racer::MatchType::Enum => CompletionItemKind::Enum,
+        racer::MatchType::StructField |
+        racer::MatchType::EnumVariant => CompletionItemKind::Field,
+        racer::MatchType::Macro |
+        racer::MatchType::Function |
+        racer::MatchType::FnArg |
+        racer::MatchType::Impl => CompletionItemKind::Function,
+        racer::MatchType::Type |
+        racer::MatchType::Trait |
+        racer::MatchType::TraitImpl => CompletionItemKind::Interface,
+        racer::MatchType::Let |
+        racer::MatchType::IfLet |
+        racer::MatchType::WhileLet |
+        racer::MatchType::For |
+        racer::MatchType::MatchArm |
+        racer::MatchType::Const |
+        racer::MatchType::Static => CompletionItemKind::Variable,
+        racer::MatchType::Builtin => CompletionItemKind::Keyword,
+    }
+}
+
+pub fn completion_item_from_racer_match(m : racer::Match) -> CompletionItem {
+    let mut item = CompletionItem::new_simple(m.matchstr.clone(), m.contextstr.clone());
+    item.kind = Some(completion_kind_from_match_type(m.mtype));
+
+    item
+}
+
 /* -----------------  JSON-RPC protocol types ----------------- */
 
 /// An event-like (no response needed) notification message.

src/test/mod.rs

@@ -398,8 +398,11 @@ fn test_completion() {
                                                         ("capabilities", "null".to_owned()),
                                                         ("rootPath", root_path)]),
                         Message::new("textDocument/completion",
-                                     vec![("textDocument", text_doc),
-                                          ("position", cache.mk_ls_position(src(&source_file_path, 22, "rld")))])];
+                                     vec![("textDocument", text_doc.to_owned()),
+                                          ("position", cache.mk_ls_position(src(&source_file_path, 22, "rld")))]),
+                        Message::new("textDocument/completion",
+                                     vec![("textDocument", text_doc.to_owned()),
+                                          ("position", cache.mk_ls_position(src(&source_file_path, 25, "x)")))])];
     let (server, results) = mock_server(messages);
     // Initialise and build.
     assert_eq!(ls_server::LsService::handle_message(server.clone()),
@@ -410,7 +413,11 @@ fn test_completion() {
 
     assert_eq!(ls_server::LsService::handle_message(server.clone()),
                ls_server::ServerStateChange::Continue);
-    expect_messages(results.clone(), &[ExpectedMessage::new(Some(42)).expect_contains("[{\"label\":\"world\",\"detail\":\"let world = \\\"world\\\";\"}]")]);
+    expect_messages(results.clone(), &[ExpectedMessage::new(Some(42)).expect_contains("[{\"label\":\"world\",\"kind\":6,\"detail\":\"let world = \\\"world\\\";\"}]")]);
+
+    assert_eq!(ls_server::LsService::handle_message(server.clone()),
+               ls_server::ServerStateChange::Continue);
+    expect_messages(results.clone(), &[ExpectedMessage::new(Some(42)).expect_contains("[{\"label\":\"x\",\"kind\":5,\"detail\":\"u64\"}]")]);
 }
 
 #[test]