1 files changed, 27 insertions, 18 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index 76c2f8173..32fd497be 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -1,6 +1,7 @@
 use hir::{Ty, Def};
 
-use crate::completion::{CompletionContext, Completions, CompletionKind, CompletionItem, CompletionItemKind};
+use crate::completion::{CompletionContext, Completions, CompletionItem, CompletionItemKind};
+use crate::completion::completion_item::CompletionKind;
 
 /// Complete dot accesses, i.e. fields or methods (currently only fields).
 pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
@@ -32,6 +33,7 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty)
                         for field in s.fields(ctx.db) {
                             CompletionItem::new(
                                 CompletionKind::Reference,
+                                ctx.source_range(),
                                 field.name().to_string(),
                             )
                             .kind(CompletionItemKind::Field)
@@ -45,9 +47,13 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty)
             }
             Ty::Tuple(fields) => {
                 for (i, _ty) in fields.iter().enumerate() {
-                    CompletionItem::new(CompletionKind::Reference, i.to_string())
-                        .kind(CompletionItemKind::Field)
-                        .add_to(acc);
+                    CompletionItem::new(
+                        CompletionKind::Reference,
+                        ctx.source_range(),
+                        i.to_string(),
+                    )
+                    .kind(CompletionItemKind::Field)
+                    .add_to(acc);
                 }
             }
             _ => {}
@@ -59,10 +65,14 @@ fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty
     receiver.iterate_methods(ctx.db, |func| {
         let sig = func.signature(ctx.db);
         if sig.has_self_param() {
-            CompletionItem::new(CompletionKind::Reference, sig.name().to_string())
-                .from_function(ctx, func)
-                .kind(CompletionItemKind::Method)
-                .add_to(acc);
+            CompletionItem::new(
+                CompletionKind::Reference,
+                ctx.source_range(),
+                sig.name().to_string(),
+            )
+            .from_function(ctx, func)
+            .kind(CompletionItemKind::Method)
+            .add_to(acc);
         }
         None::<()>
     });
@@ -71,27 +81,29 @@ fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty
 #[cfg(test)]
 mod tests {
     use crate::completion::*;
+    use crate::completion::completion_item::check_completion;
 
-    fn check_ref_completion(code: &str, expected_completions: &str) {
-        check_completion(code, expected_completions, CompletionKind::Reference);
+    fn check_ref_completion(name: &str, code: &str) {
+        check_completion(name, 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.<|>
             }
             ",
-            r#"the_field "u32""#,
         );
     }
 
     #[test]
     fn test_struct_field_completion_self() {
         check_ref_completion(
+            "struct_field_completion_self",
             r"
             struct A { the_field: (u32,) }
             impl A {
@@ -100,14 +112,13 @@ mod tests {
                 }
             }
             ",
-            r#"the_field "(u32,)"
-               foo "foo($0)""#,
         );
     }
 
     #[test]
     fn test_struct_field_completion_autoderef() {
         check_ref_completion(
+            "struct_field_completion_autoderef",
             r"
             struct A { the_field: (u32, i32) }
             impl A {
@@ -116,27 +127,26 @@ mod tests {
                 }
             }
             ",
-            r#"the_field "(u32, i32)"
-               foo "foo($0)""#,
         );
     }
 
     #[test]
     fn test_no_struct_field_completion_for_method_call() {
         check_ref_completion(
+            "no_struct_field_completion_for_method_call",
             r"
             struct A { the_field: u32 }
             fn foo(a: A) {
                a.<|>()
             }
             ",
-            r#""#,
         );
     }
 
     #[test]
     fn test_method_completion() {
         check_ref_completion(
+            "method_completion",
             r"
             struct A {}
             impl A {
@@ -146,13 +156,13 @@ mod tests {
                a.<|>
             }
             ",
-            r#"the_method "the_method($0)""#,
         );
     }
 
     #[test]
     fn test_no_non_self_method() {
         check_ref_completion(
+            "no_non_self_method",
             r"
             struct A {}
             impl A {
@@ -162,7 +172,6 @@ mod tests {
                a.<|>
             }
             ",
-            r#""#,
         );
     }
 }