Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement ancestors_with_macros in a better way

Browse source
This commit is contained in:
Florian Diebold 2019-12-06 21:46:18 +01:00
parent c80dc0ad3a
commit b2c01f446e
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crates/ra_hir/src/source_binder.rs
View file

@ -76,7 +76,7 @@ fn def_with_body_from_child_node(
db: &impl HirDatabase,
child: InFile<&SyntaxNode>,
) -> Option<DefWithBody> {
ancestors_with_macros(db, child).find_map(|node| {
child.cloned().ancestors_with_macros(db).find_map(|node| {
let n = &node.value;
match_ast! {
match n {
@ -89,17 +89,6 @@ fn def_with_body_from_child_node(
})
}
fn ancestors_with_macros<'a>(
db: &'a (impl HirDatabase),
node: InFile<&SyntaxNode>,
) -> impl Iterator<Item = InFile<SyntaxNode>> + 'a {
let file = node.with_value(()); // keep just the file id for borrow checker purposes
let parent_node = node.file_id.call_node(db);
let parent_ancestors: Box<dyn Iterator<Item = InFile<SyntaxNode>>> =
Box::new(parent_node.into_iter().flat_map(move |n| ancestors_with_macros(db, n.as_ref())));
node.value.ancestors().map(move |n| file.with_value(n)).chain(parent_ancestors)
}
/// `SourceAnalyzer` is a convenience wrapper which exposes HIR API in terms of
/// original source files. It should not be used inside the HIR itself.
#[derive(Debug)]

21
crates/ra_hir_expand/src/lib.rs
View file

@ -301,3 +301,24 @@ impl<T> InFile<T> {
db.parse_or_expand(self.file_id).expect("source created from invalid file")
}
}
impl<T: Clone> InFile<&T> {
pub fn cloned(&self) -> InFile<T> {
self.with_value(self.value.clone())
}
}
impl InFile<SyntaxNode> {
pub fn ancestors_with_macros<'a>(
self,
db: &'a impl crate::db::AstDatabase,
) -> impl Iterator<Item = InFile<SyntaxNode>> + 'a {
std::iter::successors(Some(self), move |node| match node.value.parent() {
Some(parent) => Some(node.with_value(parent)),
None => {
let parent_node = node.file_id.call_node(db)?;
Some(parent_node)
}
})
}
}