From 0c2d4a8a7758793765d33790e22c70b79b8bea56 Mon Sep 17 00:00:00 2001 From: Chetan Khilosiya Date: Mon, 15 Mar 2021 22:48:50 +0530 Subject: [PATCH] 7709: Updated the implementation. The get function from impl method is updated. and now same method used to get len and is_empty function. --- crates/hir_expand/src/name.rs | 2 + .../handlers/generate_is_empty_from_len.rs | 104 +++++++++++------- crates/ide_assists/src/tests/generated.rs | 4 + 3 files changed, 73 insertions(+), 37 deletions(-) diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs index e833e032c08..43de9edd65a 100644 --- a/crates/hir_expand/src/name.rs +++ b/crates/hir_expand/src/name.rs @@ -191,6 +191,8 @@ macro_rules! known_names { filter_map, next, iter_mut, + len, + is_empty, // Builtin macros file, column, diff --git a/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs b/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs index bd29dddb3b1..aa7072f25cc 100644 --- a/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs +++ b/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs @@ -1,4 +1,4 @@ -use hir::{AssocItem, HasSource, Impl}; +use hir::{known, HasSource, Name}; use syntax::{ ast::{self, NameOwner}, AstNode, TextRange, @@ -14,6 +14,8 @@ // Generates is_empty implementation from the len method. // // ``` +// struct MyStruct { data: Vec } +// // impl MyStruct { // p$0ub fn len(&self) -> usize { // self.data.len() @@ -22,6 +24,8 @@ // ``` // -> // ``` +// struct MyStruct { data: Vec } +// // impl MyStruct { // pub fn len(&self) -> usize { // self.data.len() @@ -46,60 +50,50 @@ pub(crate) fn generate_is_empty_from_len(acc: &mut Assists, ctx: &AssistContext) return None; } - let impl_ = fn_node.syntax().ancestors().into_iter().find_map(ast::Impl::cast)?; - let impl_def = ctx.sema.to_def(&impl_)?; - if is_empty_implemented(ctx, &impl_def) { + let impl_ = fn_node.syntax().ancestors().find_map(ast::Impl::cast)?; + if get_impl_method(ctx, &impl_, &known::is_empty).is_some() { cov_mark::hit!(is_empty_already_implemented); return None; } - let range = get_text_range_of_len_function(ctx, &impl_def)?; + let range = get_text_range_of_len_function(ctx, &impl_)?; acc.add( AssistId("generate_is_empty_from_len", AssistKind::Generate), "Generate a is_empty impl from a len function", range, |builder| { - let code = get_is_empty_code(); + let code = r#" + + pub fn is_empty(&self) -> bool { + self.len() == 0 + }"# + .to_string(); builder.insert(range.end(), code) }, ) } -fn get_function_from_impl(ctx: &AssistContext, impl_def: &Impl, name: &str) -> Option { +fn get_impl_method( + ctx: &AssistContext, + impl_: &ast::Impl, + fn_name: &Name, +) -> Option { let db = ctx.sema.db; - impl_def.items(db).into_iter().filter(|item| matches!(item, AssocItem::Function(_value))).find( - |func| match func.name(db) { - Some(fn_name) => fn_name.to_string() == name, - None => false, - }, - ) -} + let impl_def: hir::Impl = ctx.sema.to_def(impl_)?; -fn is_empty_implemented(ctx: &AssistContext, impl_def: &Impl) -> bool { - get_function_from_impl(ctx, impl_def, "is_empty").is_some() + let scope = ctx.sema.scope(impl_.syntax()); + let krate = impl_def.module(db).krate(); + let ty = impl_def.target_ty(db); + let traits_in_scope = scope.traits_in_scope(); + ty.iterate_method_candidates(db, krate, &traits_in_scope, Some(fn_name), |_, func| Some(func)) } -fn get_text_range_of_len_function(ctx: &AssistContext, impl_def: &Impl) -> Option { +fn get_text_range_of_len_function(ctx: &AssistContext, impl_: &ast::Impl) -> Option { let db = ctx.sema.db; - let len_fn = get_function_from_impl(ctx, impl_def, "len")?; - - let mut range = None; - if let AssocItem::Function(node) = len_fn { - let node = node.source(db)?; - range = Some(node.syntax().value.text_range()); - } - - range -} - -fn get_is_empty_code() -> String { - r#" - - pub fn is_empty(&self) -> bool { - self.len() == 0 - }"# - .to_string() + let func = get_impl_method(ctx, impl_, &known::len)?; + let node = func.source(db)?; + Some(node.syntax().value.text_range()) } #[cfg(test)] @@ -114,6 +108,8 @@ fn len_function_not_present() { check_assist_not_applicable( generate_is_empty_from_len, r#" +struct MyStruct { data: Vec } + impl MyStruct { p$0ub fn test(&self) -> usize { self.data.len() @@ -129,6 +125,8 @@ fn len_function_with_parameters() { check_assist_not_applicable( generate_is_empty_from_len, r#" +struct MyStruct { data: Vec } + impl MyStruct { p$0ub fn len(&self, _i: bool) -> usize { self.data.len() @@ -144,6 +142,8 @@ fn is_empty_already_implemented() { check_assist_not_applicable( generate_is_empty_from_len, r#" +struct MyStruct { data: Vec } + impl MyStruct { p$0ub fn len(&self) -> usize { self.data.len() @@ -162,6 +162,8 @@ fn generate_is_empty() { check_assist( generate_is_empty_from_len, r#" +struct MyStruct { data: Vec } + impl MyStruct { p$0ub fn len(&self) -> usize { self.data.len() @@ -169,6 +171,8 @@ impl MyStruct { } "#, r#" +struct MyStruct { data: Vec } + impl MyStruct { pub fn len(&self) -> usize { self.data.len() @@ -187,6 +191,8 @@ fn multiple_functions_in_impl() { check_assist( generate_is_empty_from_len, r#" +struct MyStruct { data: Vec } + impl MyStruct { pub fn new() -> Self { Self { data: 0 } @@ -197,11 +203,13 @@ pub fn new() -> Self { } pub fn work(&self) -> Option { - // do some work + } } "#, r#" +struct MyStruct { data: Vec } + impl MyStruct { pub fn new() -> Self { Self { data: 0 } @@ -216,7 +224,29 @@ pub fn is_empty(&self) -> bool { } pub fn work(&self) -> Option { - // do some work + + } +} +"#, + ); + } + + #[test] + fn multiple_impls() { + check_assist_not_applicable( + generate_is_empty_from_len, + r#" +struct MyStruct { data: Vec } + +impl MyStruct { + p$0ub fn len(&self) -> usize { + self.data.len() + } +} + +impl MyStruct { + pub fn is_empty(&self) -> bool { + self.len() == 0 } } "#, diff --git a/crates/ide_assists/src/tests/generated.rs b/crates/ide_assists/src/tests/generated.rs index 66fbcc96894..736027ff00b 100644 --- a/crates/ide_assists/src/tests/generated.rs +++ b/crates/ide_assists/src/tests/generated.rs @@ -726,6 +726,8 @@ fn doctest_generate_is_empty_from_len() { check_doc_test( "generate_is_empty_from_len", r#####" +struct MyStruct { data: Vec } + impl MyStruct { p$0ub fn len(&self) -> usize { self.data.len() @@ -733,6 +735,8 @@ impl MyStruct { } "#####, r#####" +struct MyStruct { data: Vec } + impl MyStruct { pub fn len(&self) -> usize { self.data.len() -- 2.44.0