Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #11175

Browse source 
11175: fix: Fix highlighting hack for self-params r=Veykril a=Veykril

Fixes https://github.com/rust-analyzer/rust-analyzer/issues/11174
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2022-01-03 00:32:31 +00:00 committed by GitHub
commit df3d3d8a74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats 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()))
}
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()
.ancestors()
.take_while(|node| ast::Expr::can_cast(node.kind()) || ast::Fn::can_cast(node.kind()))
.find_map(ast::Fn::cast)
.and_then(|s| s.param_list()?.self_param())
.find_map(ast::Item::cast)
.and_then(|item| match item {
ast::Item::Fn(fn_) => fn_.param_list()?.self_param(),
_ => None,
})
.is_some()
}