From e0e42095db8fb6a7c47c23f2a9bbcebbd8971191 Mon Sep 17 00:00:00 2001 From: Ekaterina Babshukova Date: Wed, 3 Jul 2019 16:17:18 +0300 Subject: extend add_impl_members to constants and types --- crates/ra_assists/src/add_missing_impl_members.rs | 96 ++++++++++++++++------- crates/ra_assists/src/ast_editor.rs | 41 +++++----- 2 files changed, 87 insertions(+), 50 deletions(-) diff --git a/crates/ra_assists/src/add_missing_impl_members.rs b/crates/ra_assists/src/add_missing_impl_members.rs index 0e49b0401..0c903a563 100644 --- a/crates/ra_assists/src/add_missing_impl_members.rs +++ b/crates/ra_assists/src/add_missing_impl_members.rs @@ -2,9 +2,10 @@ use crate::{Assist, AssistId, AssistCtx, ast_editor::{AstEditor, AstBuilder}}; use hir::{HasSource, db::HirDatabase}; use ra_syntax::{SmolStr, TreeArc}; -use ra_syntax::ast::{self, AstNode, FnDef, ImplItem, ImplItemKind, NameOwner}; +use ra_syntax::ast::{self, AstNode, ImplItem, ImplItemKind, NameOwner}; use ra_db::FilePosition; +#[derive(PartialEq)] enum AddMissingImplMembersMode { DefaultMethodsOnly, NoDefaultMethods, @@ -45,39 +46,50 @@ fn add_missing_impl_members_inner( resolve_target_trait_def(ctx.db, &analyzer, impl_node)? }; - let missing_fns: Vec<_> = { - let fn_def_opt = |kind| if let ImplItemKind::FnDef(def) = kind { Some(def) } else { None }; - let def_name = |def| -> Option<&SmolStr> { FnDef::name(def).map(ast::Name::text) }; - - let trait_items = - trait_def.syntax().descendants().find_map(ast::ItemList::cast)?.impl_items(); - let impl_items = impl_item_list.impl_items(); - - let trait_fns = trait_items.map(ImplItem::kind).filter_map(fn_def_opt); - let impl_fns = impl_items.map(ImplItem::kind).filter_map(fn_def_opt).collect::>(); - - trait_fns - .filter(|t| def_name(t).is_some()) - .filter(|t| match mode { - AddMissingImplMembersMode::DefaultMethodsOnly => t.body().is_some(), - AddMissingImplMembersMode::NoDefaultMethods => t.body().is_none(), - }) - .filter(|t| impl_fns.iter().all(|i| def_name(i) != def_name(t))) - .collect() + let def_name = |kind| -> Option<&SmolStr> { + match kind { + ImplItemKind::FnDef(def) => def.name(), + ImplItemKind::TypeAliasDef(def) => def.name(), + ImplItemKind::ConstDef(def) => def.name(), + } + .map(ast::Name::text) }; - if missing_fns.is_empty() { + + let trait_items = trait_def.item_list()?.impl_items(); + let impl_items = impl_item_list.impl_items().collect::>(); + + let missing_items: Vec<_> = trait_items + .filter(|t| def_name(t.kind()).is_some()) + .filter(|t| match t.kind() { + ImplItemKind::FnDef(def) => match mode { + AddMissingImplMembersMode::DefaultMethodsOnly => def.body().is_some(), + AddMissingImplMembersMode::NoDefaultMethods => def.body().is_none(), + }, + _ => mode == AddMissingImplMembersMode::NoDefaultMethods, + }) + .filter(|t| impl_items.iter().all(|i| def_name(i.kind()) != def_name(t.kind()))) + .collect(); + if missing_items.is_empty() { return None; } ctx.add_action(AssistId(assist_id), label, |edit| { let n_existing_items = impl_item_list.impl_items().count(); - let fns = missing_fns.into_iter().map(add_body_and_strip_docstring).collect::>(); - let mut ast_editor = AstEditor::new(impl_item_list); if n_existing_items == 0 { ast_editor.make_multiline(); } - ast_editor.append_functions(fns.iter().map(|it| &**it)); + + for item in missing_items { + let it = match item.kind() { + ImplItemKind::FnDef(def) => { + strip_docstring(ImplItem::cast(add_body(def).syntax()).unwrap()) + } + _ => strip_docstring(item), + }; + ast_editor.append_item(&it) + } + let first_new_item = ast_editor.ast().impl_items().nth(n_existing_items).unwrap(); let cursor_poisition = first_new_item.syntax().range().start(); ast_editor.into_text_edit(edit.text_edit_builder()); @@ -88,14 +100,19 @@ fn add_missing_impl_members_inner( ctx.build() } -fn add_body_and_strip_docstring(fn_def: &ast::FnDef) -> TreeArc { +fn strip_docstring(item: &ast::ImplItem) -> TreeArc { + let mut ast_editor = AstEditor::new(item); + ast_editor.strip_attrs_and_docs(); + ast_editor.ast().to_owned() +} + +fn add_body(fn_def: &ast::FnDef) -> TreeArc { let mut ast_editor = AstEditor::new(fn_def); if fn_def.body().is_none() { ast_editor.set_body(&AstBuilder::::single_expr( &AstBuilder::::unimplemented(), )); } - ast_editor.strip_attrs_and_docs(); ast_editor.ast().to_owned() } @@ -126,6 +143,10 @@ mod tests { add_missing_impl_members, " trait Foo { + type Output; + + const CONST: usize = 42; + fn foo(&self); fn bar(&self); fn baz(&self); @@ -139,6 +160,10 @@ impl Foo for S { }", " trait Foo { + type Output; + + const CONST: usize = 42; + fn foo(&self); fn bar(&self); fn baz(&self); @@ -148,7 +173,9 @@ struct S; impl Foo for S { fn bar(&self) {} - <|>fn foo(&self) { unimplemented!() } + <|>type Output; + const CONST: usize = 42; + fn foo(&self) { unimplemented!() } fn baz(&self) { unimplemented!() } }", @@ -256,6 +283,8 @@ impl Foo for S { <|> }", #[doc(alias = "test alias")] trait Foo { /// doc string + type Output; + #[must_use] fn foo(&self); } @@ -265,12 +294,15 @@ impl Foo for S {}<|>"#, #[doc(alias = "test alias")] trait Foo { /// doc string + type Output; + #[must_use] fn foo(&self); } struct S; impl Foo for S { - <|>fn foo(&self) { unimplemented!() } + <|>type Output; + fn foo(&self) { unimplemented!() } }"#, ) } @@ -281,6 +313,10 @@ impl Foo for S { add_missing_default_members, " trait Foo { + type Output; + + const CONST: usize = 42; + fn valid(some: u32) -> bool { false } fn foo(some: u32) -> bool; } @@ -288,6 +324,10 @@ struct S; impl Foo for S { <|> }", " trait Foo { + type Output; + + const CONST: usize = 42; + fn valid(some: u32) -> bool { false } fn foo(some: u32) -> bool; } diff --git a/crates/ra_assists/src/ast_editor.rs b/crates/ra_assists/src/ast_editor.rs index de0529b32..5f8ba3df6 100644 --- a/crates/ra_assists/src/ast_editor.rs +++ b/crates/ra_assists/src/ast_editor.rs @@ -163,11 +163,7 @@ impl AstEditor { self.do_make_multiline() } - pub fn append_functions<'a>(&mut self, fns: impl Iterator) { - fns.for_each(|it| self.append_function(it)) - } - - pub fn append_function(&mut self, fn_def: &ast::FnDef) { + pub fn append_item(&mut self, item: &ast::ImplItem) { let (indent, position) = match self.ast().impl_items().last() { Some(it) => ( leading_indent(it.syntax()).unwrap_or("").to_string(), @@ -182,8 +178,7 @@ impl AstEditor { }, }; let ws = tokens::WsBuilder::new(&format!("\n{}", indent)); - let to_insert: ArrayVec<[SyntaxElement; 2]> = - [ws.ws().into(), fn_def.syntax().into()].into(); + let to_insert: ArrayVec<[SyntaxElement; 2]> = [ws.ws().into(), item.syntax().into()].into(); self.ast = self.insert_children(position, to_insert.into_iter()); } @@ -192,6 +187,23 @@ impl AstEditor { } } +impl AstEditor { + pub fn strip_attrs_and_docs(&mut self) { + while let Some(start) = self + .ast() + .syntax() + .children_with_tokens() + .find(|it| it.kind() == ATTR || it.kind() == COMMENT) + { + let end = match start.next_sibling_or_token() { + Some(el) if el.kind() == WHITESPACE => el, + Some(_) | None => start, + }; + self.ast = self.replace_children(RangeInclusive::new(start, end), iter::empty()); + } + } +} + impl AstEditor { pub fn set_body(&mut self, body: &ast::Block) { let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new(); @@ -210,21 +222,6 @@ impl AstEditor { let replace_range = RangeInclusive::new(old_body_or_semi, old_body_or_semi); self.ast = self.replace_children(replace_range, to_insert.into_iter()) } - - pub fn strip_attrs_and_docs(&mut self) { - while let Some(start) = self - .ast() - .syntax() - .children_with_tokens() - .find(|it| it.kind() == ATTR || it.kind() == COMMENT) - { - let end = match start.next_sibling_or_token() { - Some(el) if el.kind() == WHITESPACE => el, - Some(_) | None => start, - }; - self.ast = self.replace_children(RangeInclusive::new(start, end), iter::empty()); - } - } } pub struct AstBuilder { -- cgit v1.2.3