language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: ensure that highlight_related works for macro_expr

Browse source
This commit is contained in:
roife 2024-07-10 01:23:27 +08:00
parent ae6e8d56d4
commit d94dcfa841
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/ide/src/goto_definition.rs
View file

@ -14,7 +14,6 @@ use ide_db::{
FileId, RootDatabase, FileId, RootDatabase,
}; };
use itertools::Itertools; use itertools::Itertools;
use span::FileRange;
use syntax::{ use syntax::{
ast::{self, HasLoopBody, Label}, ast::{self, HasLoopBody, Label},
match_ast, AstNode, AstToken, match_ast, AstNode, AstToken,

18
crates/ide/src/highlight_related.rs
View file

@ -575,12 +575,20 @@ impl<'a> WalkExpandedExprCtx<'a> {
} }
if let ast::Expr::MacroExpr(expr) = expr { if let ast::Expr::MacroExpr(expr) = expr {
if let Some(expanded) = expr if let Some(expanded) =
.macro_call() expr.macro_call().and_then(|call| self.sema.expand(&call))
.and_then(|call| self.sema.expand(&call))
.and_then(ast::MacroStmts::cast)
{ {
self.handle_expanded(expanded, cb); match_ast! {
match expanded {
ast::MacroStmts(it) => {
self.handle_expanded(it, cb);
},
ast::Expr(it) => {
self.walk(&it, cb);
},
_ => {}
}
}
} }
} }
} }