Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs')
| -rw-r--r-- | crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs index 1b0a8e0a8d..0469343dbf 100644 --- a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs +++ b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs @@ -1,8 +1,5 @@ use hir::{InFile, ModuleDef}; -use ide_db::{ - helpers::mod_path_to_ast, imports::import_assets::NameToImport, items_locator, - syntax_helpers::insert_whitespace_into_node::insert_ws_into, -}; +use ide_db::{helpers::mod_path_to_ast, imports::import_assets::NameToImport, items_locator}; use itertools::Itertools; use syntax::{ ast::{self, AstNode, HasName}, @@ -202,19 +199,24 @@ fn impl_def_from_trait( node }; - let trait_items = trait_items - .into_iter() - .map(|it| { - if sema.hir_file_for(it.syntax()).is_macro() { - if let Some(it) = ast::AssocItem::cast(insert_ws_into(it.syntax().clone())) { - return it; - } - } - it.clone_for_update() - }) - .collect(); + // <<<<<<< HEAD + // let trait_items = trait_items + // .into_iter() + // .map(|it| { + // if sema.hir_file_for(it.syntax()).is_macro() { + // if let Some(it) = ast::AssocItem::cast(insert_ws_into(it.syntax().clone())) { + // return it; + // } + // } + // it.clone_for_update() + // }) + // .collect(); + // let first_assoc_item = + // add_trait_assoc_items_to_impl(sema, trait_items, trait_, &impl_def, target_scope); + // ======= let first_assoc_item = - add_trait_assoc_items_to_impl(sema, trait_items, trait_, &impl_def, target_scope); + add_trait_assoc_items_to_impl(sema, &trait_items, trait_, &impl_def, target_scope); + // >>>>>>> fix(assist): derive source scope from syntax node to be transformed // Generate a default `impl` function body for the derived trait. if let ast::AssocItem::Fn(ref func) = first_assoc_item { |