2 files changed, 14 insertions, 7 deletions

diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs
index e5ba92acd..0f154112a 100644
--- a/crates/ra_analysis/src/completion/mod.rs
+++ b/crates/ra_analysis/src/completion/mod.rs
@@ -9,6 +9,7 @@ use ra_syntax::{
 };
 use ra_db::SyntaxDatabase;
 use rustc_hash::{FxHashMap};
+use hir::source_binder;
 
 use crate::{
     db,
@@ -36,7 +37,7 @@ pub(crate) fn completions(
         original_file.reparse(&edit)
     };
 
-    let module = ctry!(hir::Module::guess_from_position(db, position)?);
+    let module = ctry!(source_binder::module_from_position(db, position)?);
 
     let mut res = Vec::new();
     let mut has_completions = false;
@@ -427,7 +428,7 @@ mod tests {
         // check_snippet_completion(r"
         //     <|>
         //     ",
-        //     r##"[CompletionItem { label: "tfn", lookup: None, snippet: Some("#[test]\nfn $1() {\n    $0\n}") }]"##,
+        //     r##"[CompletionItem { label: "Test function", lookup: None, snippet: Some("#[test]\nfn test_${1:feature}() {\n$0\n}"##,
         // );
         check_snippet_completion(r"
             #[cfg(test)]
@@ -435,7 +436,7 @@ mod tests {
                 <|>
             }
             ",
-            r##"[CompletionItem { label: "tfn", lookup: None, snippet: Some("#[test]\nfn $1() {\n    $0\n}") },
+            r##"[CompletionItem { label: "Test function", lookup: Some("tfn"), snippet: Some("#[test]\nfn ${1:feature}() {\n$0\n}") },
                  CompletionItem { label: "pub(crate)", lookup: None, snippet: Some("pub(crate) $0") }]"##,
         );
     }
diff --git a/crates/ra_analysis/src/completion/reference_completion.rs b/crates/ra_analysis/src/completion/reference_completion.rs
index e1a2d5241..f483ed045 100644
--- a/crates/ra_analysis/src/completion/reference_completion.rs
+++ b/crates/ra_analysis/src/completion/reference_completion.rs
@@ -163,7 +163,7 @@ fn complete_path(
     };
     let target_module = match def_id.resolve(db)? {
         Def::Module(it) => it,
-        Def::Item => return Ok(()),
+        _ => return Ok(()),
     };
     let module_scope = target_module.scope(db)?;
     let completions = module_scope.entries().map(|(name, _res)| CompletionItem {
@@ -177,9 +177,15 @@ fn complete_path(
 
 fn complete_mod_item_snippets(acc: &mut Vec<CompletionItem>) {
     acc.push(CompletionItem {
-        label: "tfn".to_string(),
-        lookup: None,
-        snippet: Some("#[test]\nfn $1() {\n    $0\n}".to_string()),
+        label: "Test function".to_string(),
+        lookup: Some("tfn".to_string()),
+        snippet: Some(
+            "#[test]\n\
+             fn ${1:feature}() {\n\
+             $0\n\
+             }"
+            .to_string(),
+        ),
     });
     acc.push(CompletionItem {
         label: "pub(crate)".to_string(),