Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-09-20 22:42:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #4654

Browse source 
4654: Add semantic highlight to ? operator r=matklad a=ruabmbua

Made it an operator with controlFlow modifier.

To highlight in vscode as red:

```json
"editor.semanticTokenColorCustomizations": {
        "enabled": true,
        "rules": {
            "operator.controlFlow": "#ff0000",
        }
}
```

![Bildschirmfoto von 2020-05-29 21-32-06](https://user-images.githubusercontent.com/2522373/83297998-f3585a00-a1f3-11ea-9d14-4ef04b9b6b9a.png)

https://github.com/rust-analyzer/rust-analyzer/issues/4597


Co-authored-by: Roland Ruckerbauer <roland.rucky@gmail.com>
This commit is contained in:
bors[bot] 2020-05-30 08:26:04 +00:00 committed by GitHub
commit 07060b3daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,6 +391,7 @@ fn highlight_element(
INT_NUMBER | FLOAT_NUMBER => HighlightTag::NumericLiteral.into(), INT_NUMBER | FLOAT_NUMBER => HighlightTag::NumericLiteral.into(),
BYTE => HighlightTag::ByteLiteral.into(), BYTE => HighlightTag::ByteLiteral.into(),
CHAR => HighlightTag::CharLiteral.into(), CHAR => HighlightTag::CharLiteral.into(),
QUESTION => Highlight::new(HighlightTag::Operator) | HighlightModifier::ControlFlow,
LIFETIME => { LIFETIME => {
let h = Highlight::new(HighlightTag::Lifetime); let h = Highlight::new(HighlightTag::Lifetime);
match element.parent().map(|it| it.kind()) { match element.parent().map(|it| it.kind()) {

2
crates/ra_ide/src/syntax_highlighting/tags.rs
View file

@ -42,6 +42,7 @@ pub enum HighlightTag {
Local, Local,
UnresolvedReference, UnresolvedReference,
FormatSpecifier, FormatSpecifier,
Operator,
} }
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
@ -89,6 +90,7 @@ impl HighlightTag {
HighlightTag::Local => "variable", HighlightTag::Local => "variable",
HighlightTag::UnresolvedReference => "unresolved_reference", HighlightTag::UnresolvedReference => "unresolved_reference",
HighlightTag::FormatSpecifier => "format_specifier", HighlightTag::FormatSpecifier => "format_specifier",
HighlightTag::Operator => "operator",
} }
} }
} }

1
crates/rust-analyzer/src/to_proto.rs
View file

@ -317,6 +317,7 @@ fn semantic_token_type_and_modifiers(
HighlightTag::Keyword => lsp_types::SemanticTokenType::KEYWORD, HighlightTag::Keyword => lsp_types::SemanticTokenType::KEYWORD,
HighlightTag::UnresolvedReference => semantic_tokens::UNRESOLVED_REFERENCE, HighlightTag::UnresolvedReference => semantic_tokens::UNRESOLVED_REFERENCE,
HighlightTag::FormatSpecifier => semantic_tokens::FORMAT_SPECIFIER, HighlightTag::FormatSpecifier => semantic_tokens::FORMAT_SPECIFIER,
HighlightTag::Operator => lsp_types::SemanticTokenType::OPERATOR,
}; };
for modifier in highlight.modifiers.iter() { for modifier in highlight.modifiers.iter() {