From adbcedde1812b728726419f24000bf123b22fef9 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 3 Apr 2020 19:59:28 +0200 Subject: Remove the second code-path for completing names in patterns --- crates/ra_ide/src/completion/complete_scope.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'crates/ra_ide/src/completion/complete_scope.rs') diff --git a/crates/ra_ide/src/completion/complete_scope.rs b/crates/ra_ide/src/completion/complete_scope.rs index 2ca552733..665597e4c 100644 --- a/crates/ra_ide/src/completion/complete_scope.rs +++ b/crates/ra_ide/src/completion/complete_scope.rs @@ -1,19 +1,13 @@ //! Completion of names from the current scope, e.g. locals and imported items. use crate::completion::{CompletionContext, Completions}; -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 { + if !(ctx.is_trivial_path && !ctx.is_pat_binding_or_const) { return; } - ctx.scope().process_all_names(&mut |name, res| match (ctx.is_pat_binding_and_path, &res) { - (true, ScopeDef::ModuleDef(ModuleDef::Function(..))) => (), - (true, ScopeDef::ModuleDef(ModuleDef::Static(..))) => (), - (true, ScopeDef::Local(..)) => (), - _ => acc.add_resolution(ctx, name.to_string(), &res), - }); + ctx.scope().process_all_names(&mut |name, res| acc.add_resolution(ctx, name.to_string(), &res)); } #[cfg(test)] -- cgit v1.2.3