Merge #593

593: Docs for completion r=matklad a=kjeremy

The first commit adds documentation support to CompletionItems.

The second one I am unsure about. Is that the right way to add docs for functions? If so should I do something similar for other `hir` types and CompletionItems?

Co-authored-by: Jeremy Kolb <[email protected]>
Co-authored-by: Jeremy A. Kolb <[email protected]>

53 files changed, 453 insertions, 208 deletions

diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs
index c892ad846..d70c36889 100644
--- a/crates/ra_ide_api/src/completion/completion_item.rs
+++ b/crates/ra_ide_api/src/completion/completion_item.rs
@@ -15,6 +15,7 @@ pub struct CompletionItem {
     label: String,
     kind: Option<CompletionItemKind>,
     detail: Option<String>,
+    documentation: Option<String>,
     lookup: Option<String>,
     insert_text: Option<String>,
     insert_text_format: InsertTextFormat,
@@ -77,6 +78,7 @@ impl CompletionItem {
             insert_text: None,
             insert_text_format: InsertTextFormat::PlainText,
             detail: None,
+            documentation: None,
             lookup: None,
             kind: None,
             text_edit: None,
@@ -90,6 +92,10 @@ impl CompletionItem {
     pub fn detail(&self) -> Option<&str> {
         self.detail.as_ref().map(|it| it.as_str())
     }
+    /// A doc-comment
+    pub fn documentation(&self) -> Option<&str> {
+        self.documentation.as_ref().map(|it| it.as_str())
+    }
     /// What string is used for filtering.
     pub fn lookup(&self) -> &str {
         self.lookup
@@ -127,6 +133,7 @@ pub(crate) struct Builder {
     insert_text: Option<String>,
     insert_text_format: InsertTextFormat,
     detail: Option<String>,
+    documentation: Option<String>,
     lookup: Option<String>,
     kind: Option<CompletionItemKind>,
     text_edit: Option<TextEdit>,
@@ -142,6 +149,7 @@ impl Builder {
             source_range: self.source_range,
             label: self.label,
             detail: self.detail,
+            documentation: self.documentation,
             insert_text_format: self.insert_text_format,
             lookup: self.lookup,
             kind: self.kind,
@@ -184,6 +192,14 @@ impl Builder {
         self.detail = detail.map(Into::into);
         self
     }
+    #[allow(unused)]
+    pub(crate) fn documentation(self, docs: impl Into<String>) -> Builder {
+        self.set_documentation(Some(docs))
+    }
+    pub(crate) fn set_documentation(mut self, docs: Option<impl Into<String>>) -> Builder {
+        self.documentation = docs.map(Into::into);
+        self
+    }
     pub(super) fn from_resolution(
         mut self,
         ctx: &CompletionContext,
@@ -243,6 +259,10 @@ impl Builder {
             }
             self.insert_text_format = InsertTextFormat::Snippet;
         }
+        if let Some(docs) = function.docs(ctx.db) {
+            self.documentation = Some(docs);
+        }
+
         self.kind = Some(CompletionItemKind::Function);
         self
     }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
index 132048d9c..3d8d5af78 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.241096+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.858540400+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Binding
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "quux()$0"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
index e7b628f19..7ed1d5ccb 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.242456+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.860535200+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Binding
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Binding
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -36,6 +40,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "quux()$0"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
index 403fe0c4c..95581122d 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.243016+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.871506600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Binding
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Binding
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -36,6 +40,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "quux($0)"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap
index 413960191..2e763fe1d 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.206357+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.620177400+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "continue;"
@@ -85,6 +92,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "break;"
@@ -100,6 +108,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return $0;"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap
index dc2fc95e3..9dcdbf63f 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.217822+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.699965300+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return $0;"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap
index 26ca18933..b55e24bdc 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.217724+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.719911400+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Struct
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap
index f5ae8c29f..e3f00d0f1 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.208392+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.642118600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return $0"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
index 88c9287fd..18d8b3fb3 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.239872+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.797704900+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
index 33286e68b..8bf7bf06c 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.239894+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.801693300+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
index 2db0eb755..5844254e1 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.248606+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.912397100+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Binding
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "foo()$0"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion1.snap
index ed9b62586..13f915446 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion1.snap
@@ -1,13 +1,16 @@
-Created: 2019-01-21T21:32:37.509646722+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.817649800+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Postfix,
         label: "not",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "!bar"
@@ -30,6 +33,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         label: "if",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if bar {$0}"
@@ -52,6 +56,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         label: "match",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match bar {\n${1:_} => {$0\\},\n}"
@@ -74,6 +79,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         label: "while",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while bar {\n$0\n}"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion2.snap
index cc566ac35..fff87574d 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion2.snap
@@ -1,13 +1,16 @@
-Created: 2019-01-21T21:32:37.510644822+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.820642200+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Postfix,
         label: "not",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "!bar"
@@ -30,6 +33,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         label: "if",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if bar {$0}"
@@ -52,6 +56,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         label: "match",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match bar {\n${1:_} => {$0\\},\n}"
@@ -74,6 +79,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         label: "while",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while bar {\n$0\n}"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion3.snap
index c9f9bddcf..e8191596d 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion3.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__filter_postfix_completion3.snap
@@ -1,13 +1,16 @@
-Created: 2019-01-21T21:32:37.510629228+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.830614900+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Postfix,
         label: "not",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "!bar"
@@ -30,6 +33,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         label: "if",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if bar {$0}"
@@ -52,6 +56,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         label: "match",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match bar {\n${1:_} => {$0\\},\n}"
@@ -74,6 +79,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         label: "while",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while bar {\n$0\n}"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
index 7ae216cd2..732a87382 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.249349+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.932343200+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "no_args()$0"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "main()$0"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
index 231d75d7a..2431b3276 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.255317+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.995180+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "main()$0"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "with_args($0)"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap
index 4d309b20e..f1de82bcc 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.207728+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.635137200+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return;"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap
index 0f1e66ac3..c309ff9bc 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.207381+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.626162800+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "else {$0}"
@@ -85,6 +92,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "else if $0 {}"
@@ -100,6 +108,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return;"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap
index 25c29dc18..950cc8045 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.211090+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.701959300+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return $0;"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap
index 7e43be4b0..ae14d7e39 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.218272+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.788727100+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return;"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap
index 7ed890b74..2ec855bf6 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.207433+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.626162800+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "crate::"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -38,6 +42,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "super::"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap
index 4d4c7af50..92224becc 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T09:26:20.872623+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.698966900+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "super::"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap
index 66ab20f41..952650ea3 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.217815+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.779752+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "super::"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap
index 2dc47e9b1..1d8725d34 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.208669+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.642118600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return $0;"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap
index 59e11c585..54175c1a3 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.221138+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.733874300+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return $0;"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap
index 966148a36..c294de5cb 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T09:26:20.868112+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.546394900+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Method
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "the_method($0)"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
index 9ebb8a357..032516ab4 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.243581+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.874497400+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "quux()$0"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Struct
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -38,6 +42,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Enum
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
index 9b7aa0540..b33babaf0 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.244757+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.875495300+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "quux()$0"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Struct
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap
index 555f7acc6..62fb0a966 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.222109+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.723900500+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Struct
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Module
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_non_self_method.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_non_self_method.snap
index 417b692dc..7cc827532 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_non_self_method.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_non_self_method.snap
@@ -1,5 +1,7 @@
-Created: 2019-01-19T11:34:11.702251+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.552379600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 []
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap
index fd56a6c8c..a5164b03e 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.209867+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.651095300+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Keyword,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "if $0 {}"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "match $0 {}"
@@ -40,6 +44,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "while $0 {}"
@@ -55,6 +60,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "loop {$0}"
@@ -70,6 +76,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "continue"
@@ -85,6 +92,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "break"
@@ -100,6 +108,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Keyword
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "return"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_struct_field_completion_for_method_call.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_struct_field_completion_for_method_call.snap
index 0948c9fe6..7cc827532 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_struct_field_completion_for_method_call.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_struct_field_completion_for_method_call.snap
@@ -1,5 +1,7 @@
-Created: 2019-01-19T11:34:11.702201+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.552379600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 []
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap
index e0e5929ff..a5a7713ef 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap
@@ -1,13 +1,16 @@
-Created: 2019-01-20T04:00:48.203211+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.545423800+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Magic,
         label: "file_id: FileId",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: Some(
             "file_id"
         ),
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap
index 2899cf98e..0df4fcf57 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap
@@ -1,13 +1,16 @@
-Created: 2019-01-20T04:00:48.203236+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.552379600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Magic,
         label: "file_id: FileId",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: Some(
             "file_id"
         ),
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap
index 8a4d9ef63..905ece338 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap
@@ -1,13 +1,16 @@
-Created: 2019-01-20T04:00:48.206552+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.619180200+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Magic,
         label: "file_id: FileId",
         kind: None,
         detail: None,
+        documentation: None,
         lookup: Some(
             "file_id"
         ),
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap
index 632d9bbc7..0180a4f44 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T09:26:20.899262+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.717917+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             EnumVariant
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             EnumVariant
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
index 6bef3ed95..24dbe6bb0 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.245820+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.898433800+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Struct
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Function
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "x()$0"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
index 56bfe1b0d..efda72adf 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.244260+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.894444600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Binding
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
index 648d7f189..1d9aff5bb 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.252281+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.944312600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Snippet,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Snippet
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "eprintln!(\"$0 = {:?}\", $0);"
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Snippet
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "eprintln!(\"$0 = {:#?}\", $0);"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
index f5d0140ea..678335404 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.253073+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.944312600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Snippet,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Snippet
         ),
         detail: None,
+        documentation: None,
         lookup: Some(
             "tfn"
         ),
@@ -27,6 +30,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Snippet
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "pub(crate) $0"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap
index c88ddbc67..e8dc12dfd 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T09:26:20.868146+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.545423800+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -12,6 +14,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         detail: Some(
             "u32"
         ),
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap
index f310f523d..9ee668b35 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T09:26:20.868561+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.552379600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -12,6 +14,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         detail: Some(
             "(u32, i32)"
         ),
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Method
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "foo($0)"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
index 4eae65128..b9d70ea3f 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T09:26:20.868333+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.552379600+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -12,6 +14,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
         detail: Some(
             "(u32,)"
         ),
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -25,6 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Method
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: Some(
             "foo($0)"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap
index 29f7f86f1..01294ca40 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T04:00:48.223130+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.761799100+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Struct
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
@@ -23,6 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Module
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap
index 1a3bd8034..33dd2b904 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-20T09:26:20.899584+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-
+---
+created: "2019-01-22T14:45:00.780748400+00:00"
+creator: [email protected]
+expression: kind_completions
+source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+---
 [
     CompletionItem {
         completion_kind: Reference,
@@ -10,6 +12,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs
             Struct
         ),
         detail: None,
+        documentation: None,
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
diff --git a/crates/ra_ide_api/src/snapshots/tests__highlight_query_group_macro.snap b/crates/ra_ide_api/src/snapshots/tests__highlight_query_group_macro.snap
index b84aa9c78..062add083 100644
--- a/crates/ra_ide_api/src/snapshots/tests__highlight_query_group_macro.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__highlight_query_group_macro.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-15T11:15:20.732493641+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/syntax_highlighting.rs
-
+---
+created: "2019-01-22T14:45:01.017117100+00:00"
+creator: [email protected]
+expression: "&highlights"
+source: "crates\\ra_ide_api\\src\\syntax_highlighting.rs"
+---
 [
     HighlightedRange {
         range: [20; 32),
diff --git a/crates/ra_ide_api/src/snapshots/tests__highlights_code_inside_macros.snap b/crates/ra_ide_api/src/snapshots/tests__highlights_code_inside_macros.snap
index 14c6e5a4e..fd8265abb 100644
--- a/crates/ra_ide_api/src/snapshots/tests__highlights_code_inside_macros.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__highlights_code_inside_macros.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-15T11:15:20.732523231+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/syntax_highlighting.rs
-
+---
+created: "2019-01-22T14:45:01.043047100+00:00"
+creator: [email protected]
+expression: "&highlights"
+source: "crates\\ra_ide_api\\src\\syntax_highlighting.rs"
+---
 [
     HighlightedRange {
         range: [13; 15),
diff --git a/crates/ra_ide_api/src/snapshots/tests__rename_mod.snap b/crates/ra_ide_api/src/snapshots/tests__rename_mod.snap
index dc97b3334..3267d1ac5 100644
--- a/crates/ra_ide_api/src/snapshots/tests__rename_mod.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__rename_mod.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-18T08:26:43.427092+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/rename.rs
-
+---
+created: "2019-01-22T14:45:00.975229300+00:00"
+creator: [email protected]
+expression: "&source_change"
+source: "crates\\ra_ide_api\\src\\rename.rs"
+---
 Some(
     SourceChange {
         label: "rename",
diff --git a/crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap b/crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap
index 7dcd65185..e96bf5c02 100644
--- a/crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-18T08:26:43.427095+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/rename.rs
-
+---
+created: "2019-01-22T14:45:00.975229300+00:00"
+creator: [email protected]
+expression: "&source_change"
+source: "crates\\ra_ide_api\\src\\rename.rs"
+---
 Some(
     SourceChange {
         label: "rename",
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables.snap b/crates/ra_ide_api/src/snapshots/tests__runnables.snap
index ba6cba0ab..71bd7a4bd 100644
--- a/crates/ra_ide_api/src/snapshots/tests__runnables.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__runnables.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-15T11:15:20.732460119+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/runnables.rs
-
+---
+created: "2019-01-22T14:45:00.975229300+00:00"
+creator: [email protected]
+expression: "&runnables"
+source: "crates\\ra_ide_api\\src\\runnables.rs"
+---
 [
     Runnable {
         range: [1; 21),
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap b/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap
index b3f2d4d6e..a28dd8952 100644
--- a/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-15T11:15:20.732460109+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/runnables.rs
-
+---
+created: "2019-01-22T14:45:00.976230700+00:00"
+creator: [email protected]
+expression: "&runnables"
+source: "crates\\ra_ide_api\\src\\runnables.rs"
+---
 [
     Runnable {
         range: [1; 59),
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap b/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap
index 6eba482e7..79f07bef9 100644
--- a/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-15T11:15:20.732522773+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/runnables.rs
-
+---
+created: "2019-01-22T14:45:00.979218100+00:00"
+creator: [email protected]
+expression: "&runnables"
+source: "crates\\ra_ide_api\\src\\runnables.rs"
+---
 [
     Runnable {
         range: [41; 115),
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap b/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap
index f40c762f3..d199e9073 100644
--- a/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap
@@ -1,7 +1,9 @@
-Created: 2019-01-15T11:15:20.732480089+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/runnables.rs
-
+---
+created: "2019-01-22T14:45:01.016119500+00:00"
+creator: [email protected]
+expression: "&runnables"
+source: "crates\\ra_ide_api\\src\\runnables.rs"
+---
 [
     Runnable {
         range: [23; 85),