language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: Fix highlighting hack for self-params

Browse source
This commit is contained in:
Lukas Wirth 2022-01-03 01:32:03 +01:00
parent 989c06b25d
commit 087122ad1a
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ide/src/syntax_highlighting/highlight.rs
View file

@ -712,11 +712,13 @@ fn parent_matches<N: AstNode>(token: &SyntaxToken) -> bool {
token.parent().map_or(false, |it| N::can_cast(it.kind())) token.parent().map_or(false, |it| N::can_cast(it.kind()))
} }
fn is_in_fn_with_self_param<N: AstNode>(node: &N) -> bool { fn is_in_fn_with_self_param(node: &ast::NameRef) -> bool {
node.syntax() node.syntax()
.ancestors() .ancestors()
.take_while(|node| ast::Expr::can_cast(node.kind()) || ast::Fn::can_cast(node.kind())) .find_map(ast::Item::cast)
.find_map(ast::Fn::cast) .and_then(|item| match item {
.and_then(|s| s.param_list()?.self_param()) ast::Item::Fn(fn_) => fn_.param_list()?.self_param(),
_ => None,
})
.is_some() .is_some()
} }