diff options
| -rw-r--r-- | crates/hir/src/semantics.rs | 18 | ||||
| -rw-r--r-- | crates/hir_expand/src/lib.rs | 5 |
2 files changed, 15 insertions, 8 deletions
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index f15a7c2a788..9596e818185 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs @@ -2,7 +2,7 @@ mod source_to_def; -use std::{cell::RefCell, fmt}; +use std::{cell::RefCell, fmt, iter}; use base_db::{FileId, FileRange}; use either::Either; @@ -749,8 +749,8 @@ impl<'db> SemanticsImpl<'db> { fn diagnostics_display_range(&self, src: InFile<SyntaxNodePtr>) -> FileRange { let root = self.parse_or_expand(src.file_id).unwrap(); - let node = src.value.to_node(&root); - src.with_value(&node).original_file_range(self.db.upcast()) + let node = src.map(|it| it.to_node(&root)); + node.as_ref().original_file_range(self.db.upcast()) } fn token_ancestors_with_macros( @@ -765,7 +765,17 @@ impl<'db> SemanticsImpl<'db> { node: SyntaxNode, ) -> impl Iterator<Item = SyntaxNode> + Clone + '_ { let node = self.find_file(&node); - node.ancestors_with_macros(self.db.upcast()).map(|it| it.value) + let db = self.db.upcast(); + iter::successors(Some(node.cloned()), move |&InFile { file_id, ref value }| { + match value.parent() { + Some(parent) => Some(InFile::new(file_id, parent)), + None => { + self.cache(value.clone(), file_id); + file_id.call_node(db) + } + } + }) + .map(|it| it.value) } fn ancestors_at_offset_with_macros( diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs index 5e49d3f6af7..b455fd59172 100644 --- a/crates/hir_expand/src/lib.rs +++ b/crates/hir_expand/src/lib.rs @@ -636,10 +636,7 @@ impl<'a> InFile<&'a SyntaxNode> { ) -> impl Iterator<Item = InFile<SyntaxNode>> + Clone + '_ { iter::successors(Some(self.cloned()), 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) - } + None => node.file_id.call_node(db), }) } |