Merge #9191

9191: fix: Don't descend MacroCall TokenTree delimiters r=jonas-schievink a=Veykril

Fixes #9190

Co-authored-by: Lukas Wirth <[email protected]>

1 files changed, 10 insertions, 2 deletions

diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
index 827e23e2b..d522d5245 100644
--- a/crates/hir/src/semantics.rs
+++ b/crates/hir/src/semantics.rs
@@ -17,7 +17,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use syntax::{
     algo::find_node_at_offset,
     ast::{self, GenericParamsOwner, LoopBodyOwner},
-    match_ast, AstNode, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextSize,
+    match_ast, AstNode, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextRange, TextSize,
 };
 
 use crate::{
@@ -395,7 +395,15 @@ impl<'db> SemanticsImpl<'db> {
                     match node {
                         ast::MacroCall(macro_call) => {
                             let tt = macro_call.token_tree()?;
-                            if !tt.syntax().text_range().contains_range(token.value.text_range()) {
+                            let l_delim = match tt.left_delimiter_token() {
+                                Some(it) => it.text_range().end(),
+                                None => tt.syntax().text_range().start()
+                            };
+                            let r_delim = match tt.right_delimiter_token() {
+                                Some(it) => it.text_range().start(),
+                                None => tt.syntax().text_range().end()
+                            };
+                            if !TextRange::new(l_delim, r_delim).contains_range(token.value.text_range()) {
                                 return None;
                             }
                             let file_id = sa.expand(self.db, token.with_value(&macro_call))?;