7709: Updated the implementation.

The get function from impl method is updated.
and now same method used to get len and is_empty function.
This commit is contained in:
Chetan Khilosiya 2021-03-15 22:48:50 +05:30
parent 2bf3802f21
commit 0c2d4a8a77
3 changed files with 74 additions and 38 deletions

View file

@ -191,6 +191,8 @@ pub mod known {
filter_map, filter_map,
next, next,
iter_mut, iter_mut,
len,
is_empty,
// Builtin macros // Builtin macros
file, file,
column, column,

View file

@ -1,4 +1,4 @@
use hir::{AssocItem, HasSource, Impl}; use hir::{known, HasSource, Name};
use syntax::{ use syntax::{
ast::{self, NameOwner}, ast::{self, NameOwner},
AstNode, TextRange, AstNode, TextRange,
@ -14,6 +14,8 @@ use crate::{
// Generates is_empty implementation from the len method. // Generates is_empty implementation from the len method.
// //
// ``` // ```
// struct MyStruct { data: Vec<String> }
//
// impl MyStruct { // impl MyStruct {
// p$0ub fn len(&self) -> usize { // p$0ub fn len(&self) -> usize {
// self.data.len() // self.data.len()
@ -22,6 +24,8 @@ use crate::{
// ``` // ```
// -> // ->
// ``` // ```
// struct MyStruct { data: Vec<String> }
//
// impl MyStruct { // impl MyStruct {
// pub fn len(&self) -> usize { // pub fn len(&self) -> usize {
// self.data.len() // self.data.len()
@ -46,60 +50,50 @@ pub(crate) fn generate_is_empty_from_len(acc: &mut Assists, ctx: &AssistContext)
return None; return None;
} }
let impl_ = fn_node.syntax().ancestors().into_iter().find_map(ast::Impl::cast)?; let impl_ = fn_node.syntax().ancestors().find_map(ast::Impl::cast)?;
let impl_def = ctx.sema.to_def(&impl_)?; if get_impl_method(ctx, &impl_, &known::is_empty).is_some() {
if is_empty_implemented(ctx, &impl_def) {
cov_mark::hit!(is_empty_already_implemented); cov_mark::hit!(is_empty_already_implemented);
return None; 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( acc.add(
AssistId("generate_is_empty_from_len", AssistKind::Generate), AssistId("generate_is_empty_from_len", AssistKind::Generate),
"Generate a is_empty impl from a len function", "Generate a is_empty impl from a len function",
range, range,
|builder| { |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) builder.insert(range.end(), code)
}, },
) )
} }
fn get_function_from_impl(ctx: &AssistContext, impl_def: &Impl, name: &str) -> Option<AssocItem> { fn get_impl_method(
ctx: &AssistContext,
impl_: &ast::Impl,
fn_name: &Name,
) -> Option<hir::Function> {
let db = ctx.sema.db; let db = ctx.sema.db;
impl_def.items(db).into_iter().filter(|item| matches!(item, AssocItem::Function(_value))).find( let impl_def: hir::Impl = ctx.sema.to_def(impl_)?;
|func| match func.name(db) {
Some(fn_name) => fn_name.to_string() == name, let scope = ctx.sema.scope(impl_.syntax());
None => false, 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 is_empty_implemented(ctx: &AssistContext, impl_def: &Impl) -> bool { fn get_text_range_of_len_function(ctx: &AssistContext, impl_: &ast::Impl) -> Option<TextRange> {
get_function_from_impl(ctx, impl_def, "is_empty").is_some()
}
fn get_text_range_of_len_function(ctx: &AssistContext, impl_def: &Impl) -> Option<TextRange> {
let db = ctx.sema.db; let db = ctx.sema.db;
let len_fn = get_function_from_impl(ctx, impl_def, "len")?; let func = get_impl_method(ctx, impl_, &known::len)?;
let node = func.source(db)?;
let mut range = None; Some(node.syntax().value.text_range())
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()
} }
#[cfg(test)] #[cfg(test)]
@ -114,6 +108,8 @@ mod tests {
check_assist_not_applicable( check_assist_not_applicable(
generate_is_empty_from_len, generate_is_empty_from_len,
r#" r#"
struct MyStruct { data: Vec<String> }
impl MyStruct { impl MyStruct {
p$0ub fn test(&self) -> usize { p$0ub fn test(&self) -> usize {
self.data.len() self.data.len()
@ -129,6 +125,8 @@ impl MyStruct {
check_assist_not_applicable( check_assist_not_applicable(
generate_is_empty_from_len, generate_is_empty_from_len,
r#" r#"
struct MyStruct { data: Vec<String> }
impl MyStruct { impl MyStruct {
p$0ub fn len(&self, _i: bool) -> usize { p$0ub fn len(&self, _i: bool) -> usize {
self.data.len() self.data.len()
@ -144,6 +142,8 @@ impl MyStruct {
check_assist_not_applicable( check_assist_not_applicable(
generate_is_empty_from_len, generate_is_empty_from_len,
r#" r#"
struct MyStruct { data: Vec<String> }
impl MyStruct { impl MyStruct {
p$0ub fn len(&self) -> usize { p$0ub fn len(&self) -> usize {
self.data.len() self.data.len()
@ -162,6 +162,8 @@ impl MyStruct {
check_assist( check_assist(
generate_is_empty_from_len, generate_is_empty_from_len,
r#" r#"
struct MyStruct { data: Vec<String> }
impl MyStruct { impl MyStruct {
p$0ub fn len(&self) -> usize { p$0ub fn len(&self) -> usize {
self.data.len() self.data.len()
@ -169,6 +171,8 @@ impl MyStruct {
} }
"#, "#,
r#" r#"
struct MyStruct { data: Vec<String> }
impl MyStruct { impl MyStruct {
pub fn len(&self) -> usize { pub fn len(&self) -> usize {
self.data.len() self.data.len()
@ -187,6 +191,8 @@ impl MyStruct {
check_assist( check_assist(
generate_is_empty_from_len, generate_is_empty_from_len,
r#" r#"
struct MyStruct { data: Vec<String> }
impl MyStruct { impl MyStruct {
pub fn new() -> Self { pub fn new() -> Self {
Self { data: 0 } Self { data: 0 }
@ -197,11 +203,13 @@ impl MyStruct {
} }
pub fn work(&self) -> Option<usize> { pub fn work(&self) -> Option<usize> {
// do some work
} }
} }
"#, "#,
r#" r#"
struct MyStruct { data: Vec<String> }
impl MyStruct { impl MyStruct {
pub fn new() -> Self { pub fn new() -> Self {
Self { data: 0 } Self { data: 0 }
@ -216,7 +224,29 @@ impl MyStruct {
} }
pub fn work(&self) -> Option<usize> { pub fn work(&self) -> Option<usize> {
// do some work
}
}
"#,
);
}
#[test]
fn multiple_impls() {
check_assist_not_applicable(
generate_is_empty_from_len,
r#"
struct MyStruct { data: Vec<String> }
impl MyStruct {
p$0ub fn len(&self) -> usize {
self.data.len()
}
}
impl MyStruct {
pub fn is_empty(&self) -> bool {
self.len() == 0
} }
} }
"#, "#,

View file

@ -726,6 +726,8 @@ fn doctest_generate_is_empty_from_len() {
check_doc_test( check_doc_test(
"generate_is_empty_from_len", "generate_is_empty_from_len",
r#####" r#####"
struct MyStruct { data: Vec<String> }
impl MyStruct { impl MyStruct {
p$0ub fn len(&self) -> usize { p$0ub fn len(&self) -> usize {
self.data.len() self.data.len()
@ -733,6 +735,8 @@ impl MyStruct {
} }
"#####, "#####,
r#####" r#####"
struct MyStruct { data: Vec<String> }
impl MyStruct { impl MyStruct {
pub fn len(&self) -> usize { pub fn len(&self) -> usize {
self.data.len() self.data.len()