From 532e178f8e1fd3e20d1a22256d93cad2ba9954a9 Mon Sep 17 00:00:00 2001 From: Edwin Cheng Date: Sun, 22 Mar 2020 19:52:14 +0800 Subject: Add find_node_at_offset_with_descend --- crates/ra_hir/src/semantics.rs | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'crates/ra_hir') diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs index 55e634528..caece91c1 100644 --- a/crates/ra_hir/src/semantics.rs +++ b/crates/ra_hir/src/semantics.rs @@ -12,7 +12,8 @@ use hir_expand::ExpansionInfo; use ra_db::{FileId, FileRange}; use ra_prof::profile; use ra_syntax::{ - algo::skip_trivia_token, ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextUnit, + algo::{find_node_at_offset, skip_trivia_token}, + ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextUnit, }; use rustc_hash::{FxHashMap, FxHashSet}; @@ -108,6 +109,17 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> { token.value } + pub fn descend_node_at_offset( + &self, + node: &SyntaxNode, + offset: TextUnit, + ) -> Option { + // Handle macro token cases + node.token_at_offset(offset) + .map(|token| self.descend_into_macros(token)) + .find_map(|it| self.ancestors_with_macros(it.parent()).find_map(N::cast)) + } + pub fn original_range(&self, node: &SyntaxNode) -> FileRange { let node = self.find_file(node.clone()); original_range(self.db, node.as_ref()) @@ -129,6 +141,8 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> { .kmerge_by(|node1, node2| node1.text_range().len() < node2.text_range().len()) } + /// Find a AstNode by offset inside SyntaxNode, if it is inside *Macrofile*, + /// search up until it is target AstNode type pub fn find_node_at_offset_with_macros( &self, node: &SyntaxNode, @@ -137,6 +151,19 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> { self.ancestors_at_offset_with_macros(node, offset).find_map(N::cast) } + /// Find a AstNode by offset inside SyntaxNode, if it is inside *MacroCall*, + /// descend it and find again + pub fn find_node_at_offset_with_descend( + &self, + node: &SyntaxNode, + offset: TextUnit, + ) -> Option { + if let Some(it) = find_node_at_offset(&node, offset) { + return Some(it); + } + self.descend_node_at_offset(&node, offset) + } + pub fn type_of_expr(&self, expr: &ast::Expr) -> Option { self.analyze(expr.syntax()).type_of(self.db, &expr) } -- cgit v1.2.3 From af8c37cb57fcde849ef333100b8057c427bfa9a9 Mon Sep 17 00:00:00 2001 From: Edwin Cheng Date: Sun, 22 Mar 2020 22:01:48 +0800 Subject: Fix typo Co-Authored-By: Veetaha --- crates/ra_hir/src/semantics.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_hir') diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs index caece91c1..d982f6ffa 100644 --- a/crates/ra_hir/src/semantics.rs +++ b/crates/ra_hir/src/semantics.rs @@ -142,7 +142,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> { } /// Find a AstNode by offset inside SyntaxNode, if it is inside *Macrofile*, - /// search up until it is target AstNode type + /// search up until it is of the target AstNode type pub fn find_node_at_offset_with_macros( &self, node: &SyntaxNode, -- cgit v1.2.3