language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify

Browse source
This commit is contained in:
Lukas Wirth 2021-04-19 17:11:30 +02:00
parent 3f1a220f32
commit c96c38edd3
1 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
View file

@ -5,7 +5,6 @@ use itertools::Itertools;
use syntax::{ use syntax::{
ast::{self, make, AstNode, NameOwner}, ast::{self, make, AstNode, NameOwner},
SyntaxKind::{IDENT, WHITESPACE}, SyntaxKind::{IDENT, WHITESPACE},
TextSize,
}; };
use crate::{ use crate::{
@ -43,32 +42,23 @@ pub(crate) fn replace_derive_with_manual_impl(
ctx: &AssistContext, ctx: &AssistContext,
) -> Option<()> { ) -> Option<()> {
let attr = ctx.find_node_at_offset::<ast::Attr>()?; let attr = ctx.find_node_at_offset::<ast::Attr>()?;
let (name, args) = attr.as_simple_call()?;
let has_derive = attr if name != "derive" {
.syntax()
.descendants_with_tokens()
.filter(|t| t.kind() == IDENT)
.find_map(syntax::NodeOrToken::into_token)
.filter(|t| t.text() == "derive")
.is_some();
if !has_derive {
return None; return None;
} }
let trait_token = ctx.token_at_offset().find(|t| t.kind() == IDENT && t.text() != "derive")?; let trait_token = args.syntax().token_at_offset(ctx.offset()).find(|t| t.kind() == IDENT)?;
let trait_path = make::path_unqualified(make::path_segment(make::name_ref(trait_token.text()))); let trait_name = trait_token.text();
let adt = attr.syntax().parent().and_then(ast::Adt::cast)?; let adt = attr.syntax().parent().and_then(ast::Adt::cast)?;
let annotated_name = adt.name()?;
let insert_pos = adt.syntax().text_range().end();
let current_module = ctx.sema.scope(annotated_name.syntax()).module()?; let current_module = ctx.sema.scope(adt.syntax()).module()?;
let current_crate = current_module.krate(); let current_crate = current_module.krate();
let found_traits = items_locator::items_with_name( let found_traits = items_locator::items_with_name(
&ctx.sema, &ctx.sema,
current_crate, current_crate,
NameToImport::Exact(trait_token.text().to_string()), NameToImport::Exact(trait_name.to_string()),
items_locator::AssocItemSearch::Exclude, items_locator::AssocItemSearch::Exclude,
Some(items_locator::DEFAULT_QUERY_SEARCH_LIMIT), Some(items_locator::DEFAULT_QUERY_SEARCH_LIMIT),
) )
@ -86,10 +76,11 @@ pub(crate) fn replace_derive_with_manual_impl(
let mut no_traits_found = true; let mut no_traits_found = true;
for (trait_path, trait_) in found_traits.inspect(|_| no_traits_found = false) { for (trait_path, trait_) in found_traits.inspect(|_| no_traits_found = false) {
add_assist(acc, ctx, &attr, &trait_path, Some(trait_), &adt, &annotated_name, insert_pos)?; add_assist(acc, ctx, &attr, &args, &trait_path, Some(trait_), &adt)?;
} }
if no_traits_found { if no_traits_found {
add_assist(acc, ctx, &attr, &trait_path, None, &adt, &annotated_name, insert_pos)?; let trait_path = make::path_unqualified(make::path_segment(make::name_ref(trait_name)));
add_assist(acc, ctx, &attr, &args, &trait_path, None, &adt)?;
} }
Some(()) Some(())
} }
@ -98,14 +89,13 @@ fn add_assist(
acc: &mut Assists, acc: &mut Assists,
ctx: &AssistContext, ctx: &AssistContext,
attr: &ast::Attr, attr: &ast::Attr,
input: &ast::TokenTree,
trait_path: &ast::Path, trait_path: &ast::Path,
trait_: Option<hir::Trait>, trait_: Option<hir::Trait>,
adt: &ast::Adt, adt: &ast::Adt,
annotated_name: &ast::Name,
insert_pos: TextSize,
) -> Option<()> { ) -> Option<()> {
let target = attr.syntax().text_range(); let target = attr.syntax().text_range();
let input = attr.token_tree()?; let annotated_name = adt.name()?;
let label = format!("Convert to manual `impl {} for {}`", trait_path, annotated_name); let label = format!("Convert to manual `impl {} for {}`", trait_path, annotated_name);
let trait_name = trait_path.segment().and_then(|seg| seg.name_ref())?; let trait_name = trait_path.segment().and_then(|seg| seg.name_ref())?;
@ -114,8 +104,9 @@ fn add_assist(
label, label,
target, target,
|builder| { |builder| {
let insert_pos = adt.syntax().text_range().end();
let impl_def_with_items = let impl_def_with_items =
impl_def_from_trait(&ctx.sema, annotated_name, trait_, trait_path); impl_def_from_trait(&ctx.sema, &annotated_name, trait_, trait_path);
update_attribute(builder, &input, &trait_name, &attr); update_attribute(builder, &input, &trait_name, &attr);
let trait_path = format!("{}", trait_path); let trait_path = format!("{}", trait_path);
match (ctx.config.snippet_cap, impl_def_with_items) { match (ctx.config.snippet_cap, impl_def_with_items) {