aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide/src/syntax_highlighting
diff options
context:
space:
mode:
authorPaul Daniel Faria <[email protected]>2020-06-16 01:17:26 +0100
committerPaul Daniel Faria <[email protected]>2020-06-17 13:29:13 +0100
commitaae26bc5b864971ef54f4d95d5ed89a6436334e2 (patch)
tree69d972ce3b4cf3f184ebb97a9c2846b858770400 /crates/ra_ide/src/syntax_highlighting
parent931f3173992df6ac6b728fa9fa9a94d15781027e (diff)
Add highlighting support for doc comments
Diffstat (limited to 'crates/ra_ide/src/syntax_highlighting')
-rw-r--r--crates/ra_ide/src/syntax_highlighting/injection.rs8
-rw-r--r--crates/ra_ide/src/syntax_highlighting/tags.rs3
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;
7use ra_syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize}; 7use ra_syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize};
8use stdx::SepBy; 8use stdx::SepBy;
9 9
10use crate::{call_info::ActiveParameter, Analysis, HighlightTag, HighlightedRange, RootDatabase}; 10use crate::{
11 call_info::ActiveParameter, Analysis, Highlight, HighlightModifier, HighlightTag,
12 HighlightedRange, RootDatabase,
13};
11 14
12use super::HighlightedRangeStack; 15use 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 }