3 files changed, 53 insertions, 4 deletions

diff --git a/crates/ra_editor/src/completion.rs b/crates/ra_editor/src/completion.rs
index 62a63fb04..570d72d66 100644
--- a/crates/ra_editor/src/completion.rs
+++ b/crates/ra_editor/src/completion.rs
@@ -39,6 +39,12 @@ pub fn scope_completion(file: &File, offset: TextUnit) -> Option<Vec<CompletionI
         if is_node::<ast::Param>(name_ref.syntax()) {
             param_completions(name_ref.syntax(), &mut res);
         }
+        let name_range = name_ref.syntax().range();
+        let top_node = name_ref.syntax().ancestors().take_while(|it| it.range() == name_range).last().unwrap();
+        match top_node.parent().map(|it| it.kind()) {
+            Some(ROOT) | Some(ITEM_LIST) => complete_mod_item_snippets(&mut res),
+            _ => (),
+        }
     }
     if let Some(name) = find_node_at_offset::<ast::Name>(file.syntax(), offset) {
         if is_node::<ast::Param>(name.syntax()) {
@@ -216,6 +222,15 @@ fn complete_expr_snippets(acc: &mut Vec<CompletionItem>) {
     );
 }
 
+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()),
+        }
+    );
+}
+
 fn complete_fn(name_ref: ast::NameRef, scopes: &FnScopes, acc: &mut Vec<CompletionItem>) {
     let mut shadowed = HashSet::new();
     acc.extend(
@@ -506,4 +521,21 @@ mod tests {
                CompletionItem { label: "SourceRoot", lookup: None, snippet: None },
                CompletionItem { label: "file_id: FileId", lookup: Some("file_id"), snippet: None }]"#);
     }
+
+    #[test]
+    fn test_tfn_snippet() {
+        // check_snippet_completion(r"
+        //     <|>
+        //     ",
+        //     r##"[CompletionItem { label: "tfn", lookup: None, snippet: Some("#[test]\nfn $1() {\n    $0\n}") }]"##,
+        // );
+        check_snippet_completion(r"
+            #[cfg(test)]
+            mod tests {
+                <|>
+            }
+            ",
+            r##"[CompletionItem { label: "tfn", lookup: None, snippet: Some("#[test]\nfn $1() {\n    $0\n}") }]"##,
+        );
+    }
 }
diff --git a/crates/ra_editor/src/extend_selection.rs b/crates/ra_editor/src/extend_selection.rs
index 6977900e6..e12346cb6 100644
--- a/crates/ra_editor/src/extend_selection.rs
+++ b/crates/ra_editor/src/extend_selection.rs
@@ -154,6 +154,22 @@ impl S {
     }
 
     #[test]
+    fn test_extend_selection_doc_comments() {
+        do_check(
+            r#"
+struct A;
+
+/// bla
+/// bla
+struct B {
+    <|>
+}
+            "#,
+            &["\n    \n", "{\n    \n}", "/// bla\n/// bla\nstruct B {\n    \n}"]
+        )
+    }
+
+    #[test]
     fn test_extend_selection_comments() {
         do_check(
             r#"
diff --git a/crates/ra_editor/src/scope/fn_scope.rs b/crates/ra_editor/src/scope/fn_scope.rs
index a99bd1822..65d85279f 100644
--- a/crates/ra_editor/src/scope/fn_scope.rs
+++ b/crates/ra_editor/src/scope/fn_scope.rs
@@ -245,11 +245,13 @@ pub fn resolve_local_name<'a>(name_ref: ast::NameRef, scopes: &'a FnScopes) -> O
     use std::collections::HashSet;
 
     let mut shadowed = HashSet::new();
-    scopes.scope_chain(name_ref.syntax())
+    let ret = scopes.scope_chain(name_ref.syntax())
         .flat_map(|scope| scopes.entries(scope).iter())
         .filter(|entry| shadowed.insert(entry.name()))
         .filter(|entry| entry.name() == name_ref.text())
-        .nth(0)
+        .nth(0);
+    eprintln!("ret = {:?}", ret);
+    ret
 }
 
 #[cfg(test)]
@@ -357,7 +359,6 @@ mod tests {
         let scopes = FnScopes::new(fn_def);
 
         let local_name = resolve_local_name(name_ref, &scopes).unwrap().ast().name().unwrap();
-
         let expected_name = find_node_at_offset::<ast::Name>(file.syntax(), expected_offset.into()).unwrap();
         assert_eq!(local_name.syntax().range(), expected_name.syntax().range());
     }
@@ -394,4 +395,4 @@ mod tests {
         }",
         46);
     }
-}
\ No newline at end of file
+}