2 files changed, 49 insertions, 10 deletions

diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs
index fab02945c..2ec0e7ce9 100644
--- a/crates/ra_ide/src/completion/complete_trait_impl.rs
+++ b/crates/ra_ide/src/completion/complete_trait_impl.rs
@@ -142,11 +142,11 @@ fn add_function_impl(
         CompletionItemKind::Function
     };
 
-    let snippet = format!("{} {{}}", display);
+    let snippet = format!("{} {{\n    $0\n}}", display);
 
     let range = TextRange::from_to(fn_def_node.text_range().start(), ctx.source_range().end());
 
-    builder.text_edit(TextEdit::replace(range, snippet)).kind(completion_kind).add_to(acc);
+    builder.snippet_edit(TextEdit::replace(range, snippet)).kind(completion_kind).add_to(acc);
 }
 
 fn add_type_alias_impl(
@@ -217,9 +217,10 @@ fn make_const_compl_syntax(const_: &ast::ConstDef) -> String {
 
 #[cfg(test)]
 mod tests {
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
     use insta::assert_debug_snapshot;
 
+    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+
     fn complete(code: &str) -> Vec<CompletionItem> {
         do_completion(code, CompletionKind::Magic)
     }
@@ -255,7 +256,7 @@ mod tests {
                 label: "fn test()",
                 source_range: [209; 210),
                 delete: [209; 210),
-                insert: "fn test() {}",
+                insert: "fn test() {\n    $0\n}",
                 kind: Function,
                 lookup: "test",
             },
@@ -313,7 +314,7 @@ mod tests {
                 label: "fn test()",
                 source_range: [139; 140),
                 delete: [139; 140),
-                insert: "fn test() {}",
+                insert: "fn test() {\n    $0\n}",
                 kind: Function,
                 lookup: "test",
             },
@@ -342,7 +343,7 @@ mod tests {
                 label: "fn foo()",
                 source_range: [141; 142),
                 delete: [138; 142),
-                insert: "fn foo() {}",
+                insert: "fn foo() {\n    $0\n}",
                 kind: Function,
                 lookup: "foo",
             },
@@ -374,7 +375,7 @@ mod tests {
                 label: "fn foo_bar()",
                 source_range: [200; 201),
                 delete: [197; 201),
-                insert: "fn foo_bar() {}",
+                insert: "fn foo_bar() {\n    $0\n}",
                 kind: Function,
                 lookup: "foo_bar",
             },
@@ -425,7 +426,7 @@ mod tests {
                 label: "fn foo()",
                 source_range: [144; 145),
                 delete: [141; 145),
-                insert: "fn foo<T>() {}",
+                insert: "fn foo<T>() {\n    $0\n}",
                 kind: Function,
                 lookup: "foo",
             },
@@ -454,7 +455,7 @@ mod tests {
                 label: "fn foo()",
                 source_range: [166; 167),
                 delete: [163; 167),
-                insert: "fn foo<T>()\nwhere T: Into<String> {}",
+                insert: "fn foo<T>()\nwhere T: Into<String> {\n    $0\n}",
                 kind: Function,
                 lookup: "foo",
             },
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index 2d8e0776c..ad5fdcc4e 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -1,6 +1,10 @@
 //! Completion of names from the current scope, e.g. locals and imported items.
 
+use hir::ScopeDef;
+use test_utils::tested_by;
+
 use crate::completion::{CompletionContext, Completions};
+use ra_syntax::AstNode;
 
 pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionContext) {
     if !ctx.is_trivial_path {
@@ -14,12 +18,23 @@ pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
         return;
     }
 
-    ctx.scope().process_all_names(&mut |name, res| acc.add_resolution(ctx, name.to_string(), &res));
+    ctx.scope().process_all_names(&mut |name, res| {
+        if ctx.use_item_syntax.is_some() {
+            if let (ScopeDef::Unknown, Some(name_ref)) = (&res, &ctx.name_ref_syntax) {
+                if name_ref.syntax().text() == name.to_string().as_str() {
+                    tested_by!(self_fulfilling_completion);
+                    return;
+                }
+            }
+        }
+        acc.add_resolution(ctx, name.to_string(), &res)
+    });
 }
 
 #[cfg(test)]
 mod tests {
     use insta::assert_debug_snapshot;
+    use test_utils::covers;
 
     use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
 
@@ -28,6 +43,29 @@ mod tests {
     }
 
     #[test]
+    fn self_fulfilling_completion() {
+        covers!(self_fulfilling_completion);
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r#"
+                use foo<|>
+                use std::collections;
+                "#,
+            ),
+            @r###"
+            [
+                CompletionItem {
+                    label: "collections",
+                    source_range: [21; 24),
+                    delete: [21; 24),
+                    insert: "collections",
+                },
+            ]
+            "###
+        );
+    }
+
+    #[test]
     fn bind_pat_and_path_ignore_at() {
         assert_debug_snapshot!(
             do_reference_completion(