Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-16 15:14:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

v2

Browse source
This commit is contained in:
Ali Bektas 2023-08-16 00:22:08 +02:00
parent 94b3481808
commit 2a78173ff8
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
crates/ide-assists/src/handlers/generate_derive.rs
View file

@ -34,38 +34,39 @@ pub(crate) fn generate_derive(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt
.map(|(_name, arg)| arg) .map(|(_name, arg)| arg)
.next(); .next();
let (derive, delimiter) = match &derive_attr { let delimiter = match &derive_attr {
None => { None => None,
let derive = make::attr_outer(make::meta_token_tree( Some(tt) => Some(tt.right_delimiter_token()?),
make::ext::ident_path("derive"),
make::token_tree(T!['('], vec![]).clone_for_update(),
))
.clone_for_update();
let delimiter = derive.meta()?.token_tree()?.r_paren_token()?;
(derive, delimiter)
}
Some(tt) => {
// Create an outer attribute just so that we avoid using
// unwrap in edit closure.
let _derive = make::attr_outer(make::meta_token_tree(
make::ext::ident_path("derive"),
make::token_tree(T!['('], vec![]),
));
(_derive, tt.right_delimiter_token()?)
}
}; };
acc.add(AssistId("generate_derive", AssistKind::Generate), "Add `#[derive]`", target, |edit| { acc.add(AssistId("generate_derive", AssistKind::Generate), "Add `#[derive]`", target, |edit| {
match derive_attr { match derive_attr {
None => { None => {
let derive = make::attr_outer(make::meta_token_tree(
make::ext::ident_path("derive"),
make::token_tree(T!['('], vec![]).clone_for_update(),
))
.clone_for_update();
let nominal = edit.make_mut(nominal); let nominal = edit.make_mut(nominal);
nominal.add_attr(derive.clone()); nominal.add_attr(derive.clone());
let delimiter = derive
.meta()
.expect("make::attr_outer was expected to have Meta")
.token_tree()
.expect("failed to get token tree out of Meta")
.r_paren_token()
.expect("make::attr_outer was expected to have a R_PAREN");
edit.add_tabstop_before_token(cap, delimiter); edit.add_tabstop_before_token(cap, delimiter);
} }
Some(_) => { Some(_) => {
// Just move the cursor. // Just move the cursor.
edit.add_tabstop_before_token(cap, delimiter); edit.add_tabstop_before_token(
cap,
delimiter.expect("Right delim token could not be found."),
);
} }
}; };
}) })