From 67d59aeb7cc442ce629dbd3976f57000fa73df51 Mon Sep 17 00:00:00 2001 From: Josh Mcguigan Date: Mon, 15 Mar 2021 06:25:39 -0700 Subject: remove expected_name_and_type method on completion context in favor of using fields added in #8008 --- crates/ide_completion/src/render.rs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'crates/ide_completion') diff --git a/crates/ide_completion/src/render.rs b/crates/ide_completion/src/render.rs index 3e1bff4d6..670563e50 100644 --- a/crates/ide_completion/src/render.rs +++ b/crates/ide_completion/src/render.rs @@ -118,12 +118,6 @@ impl<'a> RenderContext<'a> { fn docs(&self, node: impl HasAttrs) -> Option { node.docs(self.db()) } - - // FIXME delete this method in favor of directly using the fields - // on CompletionContext - fn expected_name_and_type(&self) -> Option<(String, Type)> { - Some((self.completion.expected_name.clone()?, self.completion.expected_type.clone()?)) - } } /// Generic renderer for completion items. @@ -249,8 +243,8 @@ impl<'a> Render<'a> { relevance.is_local = true; item.set_relevance(relevance); - if let Some((_expected_name, expected_type)) = self.ctx.expected_name_and_type() { - if ty != expected_type { + if let Some(expected_type) = self.ctx.completion.expected_type.as_ref() { + if &ty != expected_type { if let Some(ty_without_ref) = expected_type.remove_ref() { if relevance_type_match(self.ctx.db().upcast(), &ty, &ty_without_ref) { cov_mark::hit!(suggest_ref); @@ -322,10 +316,8 @@ impl<'a> Render<'a> { fn compute_relevance(ctx: &RenderContext, ty: &Type, name: &str) -> CompletionRelevance { let mut res = CompletionRelevance::default(); - if let Some((expected_name, expected_type)) = ctx.expected_name_and_type() { - res.exact_type_match = ty == &expected_type; - res.exact_name_match = name == &expected_name; - } + res.exact_type_match = Some(ty) == ctx.completion.expected_type.as_ref(); + res.exact_name_match = Some(name) == ctx.completion.expected_name.as_deref(); res } -- cgit v1.2.3