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

fix: Fix expand_macro always expanding the first listed derive

Browse source
This commit is contained in:
Lukas Wirth 2022-02-22 12:32:15 +01:00
parent b494795a42
commit 2e124d15fb
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ide/src/expand_macro.rs
View file

@ -42,7 +42,7 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<
let derive = sema.descend_into_macros(tok.clone()).into_iter().find_map(|descended| {
let hir_file = sema.hir_file_for(&descended.parent()?);
if !hir_file.is_derive_attr_macro(db) {
if !hir_file.is_derive_attr_pseudo_expansion(db) {
return None;
}
@ -55,7 +55,7 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<
.token_tree()?
.token_trees_and_tokens()
.filter_map(NodeOrToken::into_token)
.take_while(|it| it == &token)
.take_while(|it| it != &token)
.filter(|it| it.kind() == T![,])
.count();
Some(ExpandedMacro {
@ -384,5 +384,18 @@ struct Foo {}
"#]],
);
check(
r#"
//- minicore: copy, clone, derive
#[derive(Copy, Cl$0one)]
struct Foo {}
"#,
expect![[r#"
Clone
impl < >core::clone::Clone for Foo< >{}
"#]],
);
}
}