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

internal: Bump Dependencies

Browse source
This commit is contained in:
Lukas Wirth 2022-06-10 16:30:09 +02:00
parent 0cf677ab42
commit 76ae5434fa
51 changed files with 181 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,10 +46,10 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<
return None;
}
let name = descended.ancestors().filter_map(ast::Path::cast).last()?.to_string();
let name = descended.parent_ancestors().filter_map(ast::Path::cast).last()?.to_string();
// up map out of the #[derive] expansion
let token = hir::InFile::new(hir_file, descended).upmap(db)?.value;
let attr = token.ancestors().find_map(ast::Attr::cast)?;
let attr = token.parent_ancestors().find_map(ast::Attr::cast)?;
let expansions = sema.expand_derive_macro(&attr)?;
let idx = attr
.token_tree()?
@ -69,7 +69,7 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<
// FIXME: Intermix attribute and bang! expansions
// currently we only recursively expand one of the two types
let mut anc = tok.ancestors();
let mut anc = tok.parent_ancestors();
let (name, expanded, kind) = loop {
let node = anc.next()?;