Fixes to more accurately give complete_scope completions

- Exclude const, static, functions form is_pat_binding_and_path
  (there might be more?)
- Add a check to filter out Record Fields
- Fix tests

1 files changed, 5 insertions, 12 deletions

diff --git a/crates/ra_ide/src/completion/complete_scope.rs b/crates/ra_ide/src/completion/complete_scope.rs
index 6b0621081..1cb2ed070 100644
--- a/crates/ra_ide/src/completion/complete_scope.rs
+++ b/crates/ra_ide/src/completion/complete_scope.rs
@@ -1,7 +1,7 @@
 //! Completion of names from the current scope, e.g. locals and imported items.
 
 use crate::completion::{CompletionContext, Completions};
-use hir::ScopeDef;
+use hir::{ModuleDef, ScopeDef};
 
 pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
     if !ctx.is_trivial_path && !ctx.is_pat_binding_and_path {
@@ -9,7 +9,10 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
     }
 
     ctx.scope().process_all_names(&mut |name, res| match (ctx.is_pat_binding_and_path, &res) {
-        (true, ScopeDef::Local(..)) => {}
+        (true, ScopeDef::ModuleDef(ModuleDef::Function(..))) => (),
+        (true, ScopeDef::ModuleDef(ModuleDef::Static(..))) => (),
+        (true, ScopeDef::ModuleDef(ModuleDef::Const(..))) => (),
+        (true, ScopeDef::Local(..)) => (),
         _ => acc.add_resolution(ctx, name.to_string(), &res),
     });
 }
@@ -71,16 +74,6 @@ mod tests {
                     insert: "Enum",
                     kind: Enum,
                 },
-                CompletionItem {
-                    label: "quux(…)",
-                    source_range: [231; 233),
-                    delete: [231; 233),
-                    insert: "quux(${1:x})$0",
-                    kind: Function,
-                    lookup: "quux",
-                    detail: "fn quux(x: Option<Enum>)",
-                    trigger_call_info: true,
-                },
             ]
             "###
         );