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

refactor: enhance highlighting for control flow kws in macros

Browse source
This commit is contained in:
roifewu 2025-06-26 13:40:24 +08:00
parent 79de21bd9d
commit 15e70c21d8
2 changed files with 45 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -412,45 +412,30 @@ pub(crate) fn find_branch_root(
sema: &Semantics<'_, RootDatabase>,
token: &SyntaxToken,
) -> Vec<SyntaxNode> {
fn find_root(
sema: &Semantics<'_, RootDatabase>,
token: &SyntaxToken,
pred: impl Fn(SyntaxNode) -> Option<SyntaxNode>,
) -> Vec<SyntaxNode> {
let mut result = Vec::new();
for token in sema.descend_into_macros(token.clone()) {
for node in sema.token_ancestors_with_macros(token) {
if ast::MacroCall::can_cast(node.kind()) {
break;
}
if let Some(node) = pred(node) {
result.push(node);
break;
}
}
}
result
}
let find_nodes = |node_filter: fn(SyntaxNode) -> Option<SyntaxNode>| {
sema.descend_into_macros(token.clone())
.into_iter()
.filter_map(|token| node_filter(token.parent()?))
.collect_vec()
};
match token.kind() {
T![match] => {
find_root(sema, token, |node| Some(ast::MatchExpr::cast(node)?.syntax().clone()))
}
T![=>] => find_root(sema, token, |node| Some(ast::MatchArm::cast(node)?.syntax().clone())),
T![if] => find_root(sema, token, |node| {
T![match] => find_nodes(|node| Some(ast::MatchExpr::cast(node)?.syntax().clone())),
T![=>] => find_nodes(|node| Some(ast::MatchArm::cast(node)?.syntax().clone())),
T![if] => find_nodes(|node| {
let if_expr = ast::IfExpr::cast(node)?;
iter::successors(Some(if_expr.clone()), |if_expr| {
let root_if = iter::successors(Some(if_expr.clone()), |if_expr| {
let parent_if = if_expr.syntax().parent().and_then(ast::IfExpr::cast)?;
if let ast::ElseBranch::IfExpr(nested_if) = parent_if.else_branch()? {
(nested_if.syntax() == if_expr.syntax()).then_some(parent_if)
} else {
None
}
let ast::ElseBranch::IfExpr(else_branch) = parent_if.else_branch()? else {
return None;
};
(else_branch.syntax() == if_expr.syntax()).then_some(parent_if)
})
.last()
.map(|if_expr| if_expr.syntax().clone())
.last()?;
Some(root_if.syntax().clone())
}),
_ => vec![],
}