5 files changed, 121 insertions, 2 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index a673dbdcf..be839345f 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -180,6 +180,26 @@ mod tests {
     }
 
     #[test]
+    fn test_method_attr_filtering() {
+        check_ref_completion(
+            "method_attr_filtering",
+            r"
+            struct A {}
+            impl A {
+                #[inline]
+                fn the_method(&self) {
+                    let x = 1;
+                    let y = 2;
+                }
+            }
+            fn foo(a: A) {
+               a.<|>
+            }
+            ",
+        );
+    }
+
+    #[test]
     fn test_tuple_field_completion() {
         check_ref_completion(
             "tuple_field_completion",
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 43532226f..4d6416284 100644
--- a/crates/ra_ide_api/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide_api/src/completion/complete_fn_param.rs
@@ -7,7 +7,7 @@ use rustc_hash::FxHashMap;
 
 use crate::completion::{CompletionContext, Completions, CompletionKind, CompletionItem};
 
-/// Complete repeated parametes, both name and type. For example, if all
+/// Complete repeated parameters, both name and type. For example, if all
 /// functions in a file have a `spam: &mut Spam` parameter, a completion with
 /// `spam: &mut Spam` insert text/label and `spam` lookup string will be
 /// suggested.
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 445788407..eeaf26d93 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();
+    let names = ctx.resolver.all_names(ctx.db);
 
     names.into_iter().for_each(|(name, res)| {
         CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.to_string())
@@ -165,4 +165,23 @@ mod tests {
     fn completes_self_in_methods() {
         check_reference_completion("self_in_methods", r"impl S { fn foo(&self) { <|> } }")
     }
+
+    #[test]
+    fn completes_prelude() {
+        check_reference_completion(
+            "completes_prelude",
+            "
+            //- /main.rs
+            fn foo() { let x: <|> }
+
+            //- /std/lib.rs
+            #[prelude_import]
+            use prelude::*;
+
+            mod prelude {
+                struct Option;
+            }
+            ",
+        );
+    }
 }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
new file mode 100644
index 000000000..2b5a1a8ea
--- /dev/null
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
@@ -0,0 +1,54 @@
+---
+created: "2019-02-13T19:52:43.734834624Z"
+creator: [email protected]
+source: crates/ra_ide_api/src/completion/completion_item.rs
+expression: kind_completions
+---
+[
+    CompletionItem {
+        completion_kind: Reference,
+        label: "Option",
+        kind: Some(
+            Struct
+        ),
+        detail: None,
+        documentation: None,
+        lookup: None,
+        insert_text: None,
+        insert_text_format: PlainText,
+        source_range: [18; 18),
+        text_edit: None
+    },
+    CompletionItem {
+        completion_kind: Reference,
+        label: "foo",
+        kind: Some(
+            Function
+        ),
+        detail: Some(
+            "fn foo()"
+        ),
+        documentation: None,
+        lookup: None,
+        insert_text: Some(
+            "foo()$0"
+        ),
+        insert_text_format: Snippet,
+        source_range: [18; 18),
+        text_edit: None
+    },
+    CompletionItem {
+        completion_kind: Reference,
+        label: "std",
+        kind: Some(
+            Module
+        ),
+        detail: None,
+        documentation: None,
+        lookup: None,
+        insert_text: None,
+        insert_text_format: PlainText,
+        source_range: [18; 18),
+        text_edit: None
+    }
+]
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
new file mode 100644
index 000000000..46f9fa971
--- /dev/null
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_attr_filtering.snap
@@ -0,0 +1,26 @@
+---
+created: "2019-02-12T18:32:09.428929418Z"
+creator: [email protected]
+source: crates/ra_ide_api/src/completion/completion_item.rs
+expression: kind_completions
+---
+[
+    CompletionItem {
+        completion_kind: Reference,
+        label: "the_method",
+        kind: Some(
+            Method
+        ),
+        detail: Some(
+            "fn the_method(&self)"
+        ),
+        documentation: None,
+        lookup: None,
+        insert_text: Some(
+            "the_method()$0"
+        ),
+        insert_text_format: Snippet,
+        source_range: [249; 249),
+        text_edit: None
+    }
+]