diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-15 15:49:34 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-15 15:49:34 +0100 |
commit | 2a01fe7d99376053b97aba9105dc7d9cf0c0641d (patch) | |
tree | d5ce4f56e7f02d861a4cfc6731d93caa024d3698 /crates/ra_ide/src | |
parent | 57652fc9d439de1315f78fb6aba34e834cb7f727 (diff) | |
parent | 119e71d9ea6448c49f597af3e0afefa6bf0f12ac (diff) |
Merge #5348
5348: Highlight punctuation as `HighlightTag::Operator` r=matklad a=ltentrup
Fixes #4620
Co-authored-by: Leander Tentrup <[email protected]>
Diffstat (limited to 'crates/ra_ide/src')
-rw-r--r-- | crates/ra_ide/src/syntax_highlighting.rs | 1 | ||||
-rw-r--r-- | crates/ra_ide/src/syntax_highlighting/tags.rs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs index b3236e821..6ac44c2c0 100644 --- a/crates/ra_ide/src/syntax_highlighting.rs +++ b/crates/ra_ide/src/syntax_highlighting.rs | |||
@@ -553,6 +553,7 @@ fn highlight_element( | |||
553 | T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => { | 553 | T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => { |
554 | Highlight::new(HighlightTag::Macro) | 554 | Highlight::new(HighlightTag::Macro) |
555 | } | 555 | } |
556 | p if p.is_punct() => HighlightTag::Punctuation.into(), | ||
556 | 557 | ||
557 | k if k.is_keyword() => { | 558 | k if k.is_keyword() => { |
558 | let h = Highlight::new(HighlightTag::Keyword); | 559 | let h = Highlight::new(HighlightTag::Keyword); |
diff --git a/crates/ra_ide/src/syntax_highlighting/tags.rs b/crates/ra_ide/src/syntax_highlighting/tags.rs index 719c6ed3c..49ec94bdc 100644 --- a/crates/ra_ide/src/syntax_highlighting/tags.rs +++ b/crates/ra_ide/src/syntax_highlighting/tags.rs | |||
@@ -32,6 +32,7 @@ pub enum HighlightTag { | |||
32 | Macro, | 32 | Macro, |
33 | Module, | 33 | Module, |
34 | NumericLiteral, | 34 | NumericLiteral, |
35 | Punctuation, | ||
35 | SelfKeyword, | 36 | SelfKeyword, |
36 | SelfType, | 37 | SelfType, |
37 | Static, | 38 | Static, |
@@ -83,6 +84,7 @@ impl HighlightTag { | |||
83 | HighlightTag::Generic => "generic", | 84 | HighlightTag::Generic => "generic", |
84 | HighlightTag::Keyword => "keyword", | 85 | HighlightTag::Keyword => "keyword", |
85 | HighlightTag::Lifetime => "lifetime", | 86 | HighlightTag::Lifetime => "lifetime", |
87 | HighlightTag::Punctuation => "punctuation", | ||
86 | HighlightTag::Macro => "macro", | 88 | HighlightTag::Macro => "macro", |
87 | HighlightTag::Module => "module", | 89 | HighlightTag::Module => "module", |
88 | HighlightTag::NumericLiteral => "numeric_literal", | 90 | HighlightTag::NumericLiteral => "numeric_literal", |