diff options
Diffstat (limited to 'crates/ra_ide/src/syntax_highlighting')
-rw-r--r-- | crates/ra_ide/src/syntax_highlighting/injection.rs | 8 | ||||
-rw-r--r-- | crates/ra_ide/src/syntax_highlighting/tags.rs | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/crates/ra_ide/src/syntax_highlighting/injection.rs b/crates/ra_ide/src/syntax_highlighting/injection.rs index 929a5cc5c..40436c5a2 100644 --- a/crates/ra_ide/src/syntax_highlighting/injection.rs +++ b/crates/ra_ide/src/syntax_highlighting/injection.rs | |||
@@ -7,7 +7,10 @@ use hir::Semantics; | |||
7 | use ra_syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize}; | 7 | use ra_syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize}; |
8 | use stdx::SepBy; | 8 | use stdx::SepBy; |
9 | 9 | ||
10 | use crate::{call_info::ActiveParameter, Analysis, HighlightTag, HighlightedRange, RootDatabase}; | 10 | use crate::{ |
11 | call_info::ActiveParameter, Analysis, Highlight, HighlightModifier, HighlightTag, | ||
12 | HighlightedRange, RootDatabase, | ||
13 | }; | ||
11 | 14 | ||
12 | use super::HighlightedRangeStack; | 15 | use super::HighlightedRangeStack; |
13 | 16 | ||
@@ -118,7 +121,8 @@ pub(super) fn extract_doc_comments( | |||
118 | range.start(), | 121 | range.start(), |
119 | range.start() + TextSize::try_from(pos).unwrap(), | 122 | range.start() + TextSize::try_from(pos).unwrap(), |
120 | ), | 123 | ), |
121 | highlight: HighlightTag::Comment.into(), | 124 | highlight: Highlight::from(HighlightTag::Comment) |
125 | | HighlightModifier::Documentation, | ||
122 | binding_hash: None, | 126 | binding_hash: None, |
123 | }); | 127 | }); |
124 | line_start += range.len() - TextSize::try_from(pos).unwrap(); | 128 | line_start += range.len() - TextSize::try_from(pos).unwrap(); |
diff --git a/crates/ra_ide/src/syntax_highlighting/tags.rs b/crates/ra_ide/src/syntax_highlighting/tags.rs index 94f466966..f593ecad8 100644 --- a/crates/ra_ide/src/syntax_highlighting/tags.rs +++ b/crates/ra_ide/src/syntax_highlighting/tags.rs | |||
@@ -55,6 +55,7 @@ pub enum HighlightModifier { | |||
55 | /// `foo` in `fn foo(x: i32)` is a definition, `foo` in `foo(90 + 2)` is | 55 | /// `foo` in `fn foo(x: i32)` is a definition, `foo` in `foo(90 + 2)` is |
56 | /// not. | 56 | /// not. |
57 | Definition, | 57 | Definition, |
58 | Documentation, | ||
58 | Mutable, | 59 | Mutable, |
59 | Unsafe, | 60 | Unsafe, |
60 | } | 61 | } |
@@ -106,6 +107,7 @@ impl HighlightModifier { | |||
106 | HighlightModifier::Attribute, | 107 | HighlightModifier::Attribute, |
107 | HighlightModifier::ControlFlow, | 108 | HighlightModifier::ControlFlow, |
108 | HighlightModifier::Definition, | 109 | HighlightModifier::Definition, |
110 | HighlightModifier::Documentation, | ||
109 | HighlightModifier::Mutable, | 111 | HighlightModifier::Mutable, |
110 | HighlightModifier::Unsafe, | 112 | HighlightModifier::Unsafe, |
111 | ]; | 113 | ]; |
@@ -115,6 +117,7 @@ impl HighlightModifier { | |||
115 | HighlightModifier::Attribute => "attribute", | 117 | HighlightModifier::Attribute => "attribute", |
116 | HighlightModifier::ControlFlow => "control", | 118 | HighlightModifier::ControlFlow => "control", |
117 | HighlightModifier::Definition => "declaration", | 119 | HighlightModifier::Definition => "declaration", |
120 | HighlightModifier::Documentation => "documentation", | ||
118 | HighlightModifier::Mutable => "mutable", | 121 | HighlightModifier::Mutable => "mutable", |
119 | HighlightModifier::Unsafe => "unsafe", | 122 | HighlightModifier::Unsafe => "unsafe", |
120 | } | 123 | } |