Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Highlight more cases of SyntaxKind when it is a punctuation

Browse source
This commit is contained in:
GrayJack 2020-07-20 09:46:50 -03:00
parent c9c518e5e9
commit 73bab32aef
No known key found for this signature in database
GPG key ID: 12C54E04AAB9931E
1 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
crates/ra_ide/src/syntax_highlighting.rs
View file

@ -539,21 +539,39 @@ fn highlight_element(
_ => h, _ => h,
} }
} }
T![*] => { p if p.is_punct() => match p {
T![::] | T![->] | T![=>] | T![&] => HighlightTag::Operator.into(),
T![@] => HighlightTag::Operator | HighlightModifier::ControlFlow,
T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
Highlight::new(HighlightTag::Macro)
}
T![*] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?; let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
let expr = prefix_expr.expr()?; let expr = prefix_expr.expr()?;
let ty = sema.type_of_expr(&expr)?; let ty = sema.type_of_expr(&expr)?;
if !ty.is_raw_ptr() { if ty.is_raw_ptr() {
return None;
} else {
HighlightTag::Operator | HighlightModifier::Unsafe HighlightTag::Operator | HighlightModifier::Unsafe
} else if let Some(ast::PrefixOp::Deref) = prefix_expr.op_kind() {
HighlightTag::Operator.into()
} else {
HighlightTag::Punctuation.into()
} }
} }
T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => { T![-] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
Highlight::new(HighlightTag::Macro) HighlightTag::NumericLiteral.into()
} }
p if p.is_punct() => HighlightTag::Punctuation.into(), _ if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
HighlightTag::Operator.into()
}
_ if element.parent().and_then(ast::BinExpr::cast).is_some() => {
HighlightTag::Operator.into()
}
_ if element.parent().and_then(ast::RangeExpr::cast).is_some() => {
HighlightTag::Operator.into()
}
_ => HighlightTag::Punctuation.into(),
},
k if k.is_keyword() => { k if k.is_keyword() => {
let h = Highlight::new(HighlightTag::Keyword); let h = Highlight::new(HighlightTag::Keyword);