22 files changed, 248 insertions, 300 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index 18b2d68d5..4a111aba5 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -4,17 +4,10 @@ use crate::completion::{CompletionContext, Completions};
 
 /// Complete dot accesses, i.e. fields or methods (currently only fields).
 pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
-    let (function, receiver) = match (&ctx.function, ctx.dot_receiver) {
-        (Some(function), Some(receiver)) => (function, receiver),
-        _ => return,
-    };
-    let infer_result = function.infer(ctx.db);
-    let source_map = function.body_source_map(ctx.db);
-    let expr = match source_map.node_expr(receiver) {
-        Some(expr) => expr,
+    let receiver_ty = match ctx.dot_receiver.and_then(|it| ctx.analyzer.type_of(ctx.db, it)) {
+        Some(it) => it,
         None => return,
     };
-    let receiver_ty = infer_result[expr].clone();
     if !ctx.is_call {
         complete_fields(acc, ctx, receiver_ty.clone());
     }
@@ -55,29 +48,41 @@ fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty
 
 #[cfg(test)]
 mod tests {
-    use crate::completion::{check_completion, CompletionKind};
+    use crate::completion::{do_completion, CompletionKind, CompletionItem};
+    use insta::assert_debug_snapshot_matches;
 
-    fn check_ref_completion(name: &str, code: &str) {
-        check_completion(name, code, CompletionKind::Reference);
+    fn do_ref_completion(code: &str) -> Vec<CompletionItem> {
+        do_completion(code, CompletionKind::Reference)
     }
 
     #[test]
     fn test_struct_field_completion() {
-        check_ref_completion(
-            "struct_field_completion",
-            r"
-            struct A { the_field: u32 }
-            fn foo(a: A) {
-               a.<|>
-            }
-            ",
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
+                r"
+                struct A { the_field: u32 }
+                fn foo(a: A) {
+                a.<|>
+                }
+                ",
+        ),
+            @r###"[
+    CompletionItem {
+        label: "the_field",
+        source_range: [94; 94),
+        delete: [94; 94),
+        insert: "the_field",
+        kind: Field,
+        detail: "u32"
+    }
+]"###
         );
     }
 
     #[test]
     fn test_struct_field_completion_self() {
-        check_ref_completion(
-            "struct_field_completion_self",
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
             r"
             struct A {
                 /// This is the_field
@@ -89,13 +94,35 @@ mod tests {
                 }
             }
             ",
+        ),
+        @r###"[
+    CompletionItem {
+        label: "foo",
+        source_range: [187; 187),
+        delete: [187; 187),
+        insert: "foo()$0",
+        kind: Method,
+        detail: "fn foo(self)"
+    },
+    CompletionItem {
+        label: "the_field",
+        source_range: [187; 187),
+        delete: [187; 187),
+        insert: "the_field",
+        kind: Field,
+        detail: "(u32,)",
+        documentation: Documentation(
+            "This is the_field"
+        )
+    }
+]"###
         );
     }
 
     #[test]
     fn test_struct_field_completion_autoderef() {
-        check_ref_completion(
-            "struct_field_completion_autoderef",
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
             r"
             struct A { the_field: (u32, i32) }
             impl A {
@@ -104,26 +131,47 @@ mod tests {
                 }
             }
             ",
+        ),
+        @r###"[
+    CompletionItem {
+        label: "foo",
+        source_range: [126; 126),
+        delete: [126; 126),
+        insert: "foo()$0",
+        kind: Method,
+        detail: "fn foo(&self)"
+    },
+    CompletionItem {
+        label: "the_field",
+        source_range: [126; 126),
+        delete: [126; 126),
+        insert: "the_field",
+        kind: Field,
+        detail: "(u32, i32)"
+    }
+]"###
         );
     }
 
     #[test]
     fn test_no_struct_field_completion_for_method_call() {
-        check_ref_completion(
-            "no_struct_field_completion_for_method_call",
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
             r"
             struct A { the_field: u32 }
             fn foo(a: A) {
                a.<|>()
             }
             ",
+        ),
+        @"[]"
         );
     }
 
     #[test]
     fn test_method_completion() {
-        check_ref_completion(
-            "method_completion",
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
             r"
             struct A {}
             impl A {
@@ -133,13 +181,24 @@ mod tests {
                a.<|>
             }
             ",
+        ),
+        @r###"[
+    CompletionItem {
+        label: "the_method",
+        source_range: [144; 144),
+        delete: [144; 144),
+        insert: "the_method()$0",
+        kind: Method,
+        detail: "fn the_method(&self)"
+    }
+]"###
         );
     }
 
     #[test]
     fn test_no_non_self_method() {
-        check_ref_completion(
-            "no_non_self_method",
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
             r"
             struct A {}
             impl A {
@@ -149,13 +208,15 @@ mod tests {
                a.<|>
             }
             ",
+        ),
+        @"[]"
         );
     }
 
     #[test]
     fn test_method_attr_filtering() {
-        check_ref_completion(
-            "method_attr_filtering",
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
             r"
             struct A {}
             impl A {
@@ -169,26 +230,56 @@ mod tests {
                a.<|>
             }
             ",
+        ),
+        @r###"[
+    CompletionItem {
+        label: "the_method",
+        source_range: [249; 249),
+        delete: [249; 249),
+        insert: "the_method()$0",
+        kind: Method,
+        detail: "fn the_method(&self)"
+    }
+]"###
         );
     }
 
     #[test]
     fn test_tuple_field_completion() {
-        check_ref_completion(
-            "tuple_field_completion",
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
             r"
             fn foo() {
                let b = (0, 3.14);
                b.<|>
             }
             ",
+        ),
+        @r###"[
+    CompletionItem {
+        label: "0",
+        source_range: [75; 75),
+        delete: [75; 75),
+        insert: "0",
+        kind: Field,
+        detail: "i32"
+    },
+    CompletionItem {
+        label: "1",
+        source_range: [75; 75),
+        delete: [75; 75),
+        insert: "1",
+        kind: Field,
+        detail: "f64"
+    }
+]"###
         );
     }
 
     #[test]
     fn test_tuple_field_inference() {
-        check_ref_completion(
-            "tuple_field_inference",
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
             r"
             pub struct S;
             impl S {
@@ -204,6 +295,41 @@ mod tests {
                 }
             }
             ",
+        ),
+        @r###"[
+    CompletionItem {
+        label: "blah",
+        source_range: [299; 300),
+        delete: [299; 300),
+        insert: "blah()$0",
+        kind: Method,
+        detail: "pub fn blah(&self)"
+    }
+]"###
+        );
+    }
+
+    #[test]
+    fn test_completion_works_in_consts() {
+        assert_debug_snapshot_matches!(
+        do_ref_completion(
+            r"
+            struct A { the_field: u32 }
+            const X: u32 = {
+                A { the_field: 92 }.<|>
+            };
+            ",
+        ),
+        @r###"[
+    CompletionItem {
+        label: "the_field",
+        source_range: [106; 106),
+        delete: [106; 106),
+        insert: "the_field",
+        kind: Field,
+        detail: "u32"
+    }
+]"###
         );
     }
 }
diff --git a/crates/ra_ide_api/src/completion/complete_fn_param.rs b/crates/ra_ide_api/src/completion/complete_fn_param.rs
index f87ccdeb9..85ef62f52 100644
--- a/crates/ra_ide_api/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide_api/src/completion/complete_fn_param.rs
@@ -54,48 +54,79 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
 
 #[cfg(test)]
 mod tests {
-    use crate::completion::{check_completion, CompletionKind};
+    use crate::completion::{do_completion, CompletionItem, CompletionKind};
+    use insta::assert_debug_snapshot_matches;
 
-    fn check_magic_completion(name: &str, code: &str) {
-        check_completion(name, code, CompletionKind::Magic);
+    fn do_magic_completion(code: &str) -> Vec<CompletionItem> {
+        do_completion(code, CompletionKind::Magic)
     }
 
     #[test]
     fn test_param_completion_last_param() {
-        check_magic_completion(
-            "param_completion_last_param",
-            r"
-            fn foo(file_id: FileId) {}
-            fn bar(file_id: FileId) {}
-            fn baz(file<|>) {}
-            ",
+        assert_debug_snapshot_matches!(
+        do_magic_completion(
+                r"
+                fn foo(file_id: FileId) {}
+                fn bar(file_id: FileId) {}
+                fn baz(file<|>) {}
+                ",
+        ),
+            @r###"[
+    CompletionItem {
+        label: "file_id: FileId",
+        source_range: [110; 114),
+        delete: [110; 114),
+        insert: "file_id: FileId",
+        lookup: "file_id"
+    }
+]"###
         );
     }
 
     #[test]
     fn test_param_completion_nth_param() {
-        check_magic_completion(
-            "param_completion_nth_param",
-            r"
-            fn foo(file_id: FileId) {}
-            fn bar(file_id: FileId) {}
-            fn baz(file<|>, x: i32) {}
-            ",
+        assert_debug_snapshot_matches!(
+        do_magic_completion(
+                r"
+                fn foo(file_id: FileId) {}
+                fn bar(file_id: FileId) {}
+                fn baz(file<|>, x: i32) {}
+                ",
+        ),
+            @r###"[
+    CompletionItem {
+        label: "file_id: FileId",
+        source_range: [110; 114),
+        delete: [110; 114),
+        insert: "file_id: FileId",
+        lookup: "file_id"
+    }
+]"###
         );
     }
 
     #[test]
     fn test_param_completion_trait_param() {
-        check_magic_completion(
-            "param_completion_trait_param",
-            r"
-            pub(crate) trait SourceRoot {
-                pub fn contains(&self, file_id: FileId) -> bool;
-                pub fn module_map(&self) -> &ModuleMap;
-                pub fn lines(&self, file_id: FileId) -> &LineIndex;
-                pub fn syntax(&self, file<|>)
-            }
-            ",
+        assert_debug_snapshot_matches!(
+        do_magic_completion(
+                r"
+                pub(crate) trait SourceRoot {
+                    pub fn contains(&self, file_id: FileId) -> bool;
+                    pub fn module_map(&self) -> &ModuleMap;
+                    pub fn lines(&self, file_id: FileId) -> &LineIndex;
+                    pub fn syntax(&self, file<|>)
+                }
+                ",
+        ),
+            @r###"[
+    CompletionItem {
+        label: "file_id: FileId",
+        source_range: [289; 293),
+        delete: [289; 293),
+        insert: "file_id: FileId",
+        lookup: "file_id"
+    }
+]"###
         );
     }
 }
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index e54fe7b7e..bc03a7095 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -1,4 +1,4 @@
-use hir::Resolution;
+use hir::{Resolution, Either};
 use ra_syntax::AstNode;
 use test_utils::tested_by;
 
@@ -9,7 +9,7 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
         Some(path) => path.clone(),
         _ => return,
     };
-    let def = match ctx.resolver.resolve_path(ctx.db, &path).take_types() {
+    let def = match ctx.analyzer.resolve_hir_path(ctx.db, &path).take_types() {
         Some(Resolution::Def(def)) => def,
         _ => return,
     };
@@ -19,10 +19,8 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
             for (name, res) in module_scope.entries() {
                 if Some(module) == ctx.module {
                     if let Some(import) = res.import {
-                        if let hir::ImportSource::UseTree(tree) =
-                            module.import_source(ctx.db, import)
-                        {
-                            if tree.syntax().range().contains_inclusive(ctx.offset) {
+                        if let Either::A(use_tree) = module.import_source(ctx.db, import) {
+                            if use_tree.syntax().range().contains_inclusive(ctx.offset) {
                                 // for `use self::foo<|>`, don't suggest `foo` as a completion
                                 tested_by!(dont_complete_current_use);
                                 continue;
diff --git a/crates/ra_ide_api/src/completion/complete_pattern.rs b/crates/ra_ide_api/src/completion/complete_pattern.rs
index 7abcd019b..0ef248687 100644
--- a/crates/ra_ide_api/src/completion/complete_pattern.rs
+++ b/crates/ra_ide_api/src/completion/complete_pattern.rs
@@ -7,7 +7,7 @@ pub(super) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
     }
     // FIXME: ideally, we should look at the type we are matching against and
     // suggest variants + auto-imports
-    let names = ctx.resolver.all_names(ctx.db);
+    let names = ctx.analyzer.all_names(ctx.db);
     for (name, res) in names.into_iter() {
         let r = res.as_ref();
         let def = match r.take_types().or(r.take_values()) {
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 6146b7bb6..fd256fc3b 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -4,7 +4,7 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
     if !ctx.is_trivial_path {
         return;
     }
-    let names = ctx.resolver.all_names(ctx.db);
+    let names = ctx.analyzer.all_names(ctx.db);
 
     names.into_iter().for_each(|(name, res)| acc.add_resolution(ctx, name.to_string(), &res));
 }
@@ -145,7 +145,7 @@ mod tests {
         check_reference_completion(
             "dont_show_both_completions_for_shadowing",
             r"
-            fn foo() -> {
+            fn foo() {
                 let bar = 92;
                 {
                     let bar = 62;
diff --git a/crates/ra_ide_api/src/completion/complete_struct_literal.rs b/crates/ra_ide_api/src/completion/complete_struct_literal.rs
index f58bcd03e..48fbf67f7 100644
--- a/crates/ra_ide_api/src/completion/complete_struct_literal.rs
+++ b/crates/ra_ide_api/src/completion/complete_struct_literal.rs
@@ -4,17 +4,10 @@ use crate::completion::{CompletionContext, Completions};
 
 /// Complete fields in fields literals.
 pub(super) fn complete_struct_literal(acc: &mut Completions, ctx: &CompletionContext) {
-    let (function, struct_lit) = match (&ctx.function, ctx.struct_lit_syntax) {
-        (Some(function), Some(struct_lit)) => (function, struct_lit),
-        _ => return,
-    };
-    let infer_result = function.infer(ctx.db);
-    let source_map = function.body_source_map(ctx.db);
-    let expr = match source_map.node_expr(struct_lit.into()) {
-        Some(expr) => expr,
+    let ty = match ctx.struct_lit_syntax.and_then(|it| ctx.analyzer.type_of(ctx.db, it.into())) {
+        Some(it) => it,
         None => return,
     };
-    let ty = infer_result[expr].clone();
     let (adt, substs) = match ty.as_adt() {
         Some(res) => res,
         _ => return,
diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs
index 65dffa470..359f2cffa 100644
--- a/crates/ra_ide_api/src/completion/completion_context.rs
+++ b/crates/ra_ide_api/src/completion/completion_context.rs
@@ -5,7 +5,7 @@ use ra_syntax::{
     algo::{find_token_at_offset, find_covering_element, find_node_at_offset},
     SyntaxKind::*,
 };
-use hir::{source_binder, Resolver};
+use hir::source_binder;
 
 use crate::{db, FilePosition};
 
@@ -14,11 +14,10 @@ use crate::{db, FilePosition};
 #[derive(Debug)]
 pub(crate) struct CompletionContext<'a> {
     pub(super) db: &'a db::RootDatabase,
+    pub(super) analyzer: hir::SourceAnalyzer,
     pub(super) offset: TextUnit,
     pub(super) token: SyntaxToken<'a>,
-    pub(super) resolver: Resolver,
     pub(super) module: Option<hir::Module>,
-    pub(super) function: Option<hir::Function>,
     pub(super) function_syntax: Option<&'a ast::FnDef>,
     pub(super) use_item_syntax: Option<&'a ast::UseItem>,
     pub(super) struct_lit_syntax: Option<&'a ast::StructLit>,
@@ -47,16 +46,16 @@ impl<'a> CompletionContext<'a> {
         original_file: &'a SourceFile,
         position: FilePosition,
     ) -> Option<CompletionContext<'a>> {
-        let resolver = source_binder::resolver_for_position(db, position);
         let module = source_binder::module_from_position(db, position);
         let token = find_token_at_offset(original_file.syntax(), position.offset).left_biased()?;
+        let analyzer =
+            hir::SourceAnalyzer::new(db, position.file_id, token.parent(), Some(position.offset));
         let mut ctx = CompletionContext {
             db,
+            analyzer,
             token,
             offset: position.offset,
-            resolver,
             module,
-            function: None,
             function_syntax: None,
             use_item_syntax: None,
             struct_lit_syntax: None,
@@ -147,10 +146,6 @@ impl<'a> CompletionContext<'a> {
             .ancestors()
             .take_while(|it| it.kind() != SOURCE_FILE && it.kind() != MODULE)
             .find_map(ast::FnDef::cast);
-        if let (Some(module), Some(fn_def)) = (self.module, self.function_syntax) {
-            let function = source_binder::function_from_module(self.db, module, fn_def);
-            self.function = Some(function);
-        }
 
         let parent = match name_ref.syntax().parent() {
             Some(it) => it,
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index 28c8f83ab..9aa346688 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -6,6 +6,9 @@ use ra_syntax::ast::NameOwner;
 
 use crate::completion::{
     Completions, CompletionKind, CompletionItemKind, CompletionContext, CompletionItem,
+};
+
+use crate::display::{
     function_label, const_label, type_label,
 };
 
@@ -101,7 +104,7 @@ impl Completions {
                 CompletionItemKind::Function
             })
             .set_documentation(func.docs(ctx.db))
-            .set_detail(detail);
+            .detail(detail);
         // If not an import, add parenthesis automatically.
         if ctx.use_item_syntax.is_none() && !ctx.is_call {
             tested_by!(inserts_parens_for_function_calls);
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 87691b304..34adcda6c 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,23 +1,23 @@
 ---
-created: "2019-02-18T09:22:24.188564584Z"
-creator: insta@0.6.2
+created: "2019-04-04T14:52:24.531844100Z"
+creator: insta@0.7.4
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
 ---
 [
     CompletionItem {
         label: "bar",
-        source_range: [129; 129),
-        delete: [129; 129),
+        source_range: [126; 126),
+        delete: [126; 126),
         insert: "bar",
         kind: Binding
     },
     CompletionItem {
         label: "foo",
-        source_range: [129; 129),
-        delete: [129; 129),
+        source_range: [126; 126),
+        delete: [126; 126),
         insert: "foo()$0",
         kind: Function,
-        detail: "fn foo() ->"
+        detail: "fn foo()"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_attr_filtering.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_attr_filtering.snap
deleted file mode 100644
index ce8af2159..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_attr_filtering.snap
+++ /dev/null
@@ -1,16 +0,0 @@
----
-created: "2019-02-18T09:22:23.941335305Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "the_method",
-        source_range: [249; 249),
-        delete: [249; 249),
-        insert: "the_method()$0",
-        kind: Method,
-        detail: "fn the_method(&self)"
-    }
-]
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
deleted file mode 100644
index 41a10de14..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap
+++ /dev/null
@@ -1,16 +0,0 @@
----
-created: "2019-02-18T09:22:23.939676100Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "the_method",
-        source_range: [144; 144),
-        delete: [144; 144),
-        insert: "the_method()$0",
-        kind: Method,
-        detail: "fn the_method(&self)"
-    }
-]
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
deleted file mode 100644
index 7cc827532..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_non_self_method.snap
+++ /dev/null
@@ -1,7 +0,0 @@
----
-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_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
deleted file mode 100644
index 7cc827532..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_struct_field_completion_for_method_call.snap
+++ /dev/null
@@ -1,7 +0,0 @@
----
-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
deleted file mode 100644
index cab77f5a2..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap
+++ /dev/null
@@ -1,15 +0,0 @@
----
-created: "2019-02-18T09:22:23.949634602Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "file_id: FileId",
-        source_range: [98; 102),
-        delete: [98; 102),
-        insert: "file_id: FileId",
-        lookup: "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
deleted file mode 100644
index 8fbee160c..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap
+++ /dev/null
@@ -1,15 +0,0 @@
----
-created: "2019-02-18T09:22:23.949634355Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "file_id: FileId",
-        source_range: [98; 102),
-        delete: [98; 102),
-        insert: "file_id: FileId",
-        lookup: "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
deleted file mode 100644
index 76eeadb6d..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap
+++ /dev/null
@@ -1,15 +0,0 @@
----
-created: "2019-02-18T09:22:23.974417169Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "file_id: FileId",
-        source_range: [269; 273),
-        delete: [269; 273),
-        insert: "file_id: FileId",
-        lookup: "file_id"
-    }
-]
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 0738cf466..ff36df707 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,6 +1,6 @@
 ---
-created: "2019-02-18T09:22:24.182964414Z"
-creator: insta@0.6.2
+created: "2019-04-04T14:52:24.525395600Z"
+creator: insta@0.7.4
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
 ---
@@ -18,6 +18,6 @@ expression: kind_completions
         delete: [47; 47),
         insert: "x()$0",
         kind: Function,
-        detail: "fn x() ->"
+        detail: "fn x()"
     }
 ]
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
deleted file mode 100644
index 58271b873..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap
+++ /dev/null
@@ -1,16 +0,0 @@
----
-created: "2019-02-18T09:22:23.939645902Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "the_field",
-        source_range: [85; 85),
-        delete: [85; 85),
-        insert: "the_field",
-        kind: Field,
-        detail: "u32"
-    }
-]
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
deleted file mode 100644
index b38867b81..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap
+++ /dev/null
@@ -1,24 +0,0 @@
----
-created: "2019-02-18T09:22:23.940872916Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "foo",
-        source_range: [126; 126),
-        delete: [126; 126),
-        insert: "foo()$0",
-        kind: Method,
-        detail: "fn foo(&self)"
-    },
-    CompletionItem {
-        label: "the_field",
-        source_range: [126; 126),
-        delete: [126; 126),
-        insert: "the_field",
-        kind: Field,
-        detail: "(u32, i32)"
-    }
-]
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
deleted file mode 100644
index 8e5cab43e..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
+++ /dev/null
@@ -1,27 +0,0 @@
----
-created: "2019-02-18T09:22:23.940872918Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "foo",
-        source_range: [187; 187),
-        delete: [187; 187),
-        insert: "foo()$0",
-        kind: Method,
-        detail: "fn foo(self)"
-    },
-    CompletionItem {
-        label: "the_field",
-        source_range: [187; 187),
-        delete: [187; 187),
-        insert: "the_field",
-        kind: Field,
-        detail: "(u32,)",
-        documentation: Documentation(
-            "This is the_field"
-        )
-    }
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_completion.snap
deleted file mode 100644
index 3f2780621..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_completion.snap
+++ /dev/null
@@ -1,24 +0,0 @@
----
-created: "2019-02-18T09:22:23.939710971Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "0",
-        source_range: [75; 75),
-        delete: [75; 75),
-        insert: "0",
-        kind: Field,
-        detail: "i32"
-    },
-    CompletionItem {
-        label: "1",
-        source_range: [75; 75),
-        delete: [75; 75),
-        insert: "1",
-        kind: Field,
-        detail: "f64"
-    }
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_inference.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_inference.snap
deleted file mode 100644
index 72c8973b8..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_inference.snap
+++ /dev/null
@@ -1,16 +0,0 @@
----
-created: "2019-04-05T23:00:18.283812700Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
----
-[
-    CompletionItem {
-        label: "blah",
-        source_range: [299; 300),
-        delete: [299; 300),
-        insert: "blah()$0",
-        kind: Method,
-        detail: "pub fn blah(&self)"
-    }
-]