From d8230acd84dc931f72b9dd32b8fbc2aa887d8b4b Mon Sep 17 00:00:00 2001
From: Paul Daniel Faria <nashenas88@users.noreply.github.com>
Date: Mon, 22 Jun 2020 10:28:07 -0400
Subject: Add punctuation highlighting for highlighting punctuation in
 doctests, fix highlighting in doctests

---
 crates/ra_ide/src/syntax_highlighting/html.rs      | 4 ++--
 crates/ra_ide/src/syntax_highlighting/injection.rs | 4 +---
 crates/ra_ide/src/syntax_highlighting/tags.rs      | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'crates/ra_ide/src/syntax_highlighting')

diff --git a/crates/ra_ide/src/syntax_highlighting/html.rs b/crates/ra_ide/src/syntax_highlighting/html.rs
index 191c586a3..2a27c81dd 100644
--- a/crates/ra_ide/src/syntax_highlighting/html.rs
+++ b/crates/ra_ide/src/syntax_highlighting/html.rs
@@ -19,7 +19,7 @@ pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId, rainbow: boo
         )
     }
 
-    let ranges = highlight(db, file_id, None, false, None);
+    let ranges = highlight(db, file_id, None, false, false);
     let text = parse.tree().syntax().to_string();
     let mut prev_pos = TextSize::from(0);
     let mut buf = String::new();
@@ -64,7 +64,7 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .lifetime           { color: #DFAF8F; font-style: italic; }
 .comment            { color: #7F9F7F; }
-.documentation      { color: #00CC00; }
+.documentation      { color: #629755; }
 .injected           { opacity: 0.65 ; }
 .struct, .enum      { color: #7CB8BB; }
 .enum_variant       { color: #BDE0F3; }
diff --git a/crates/ra_ide/src/syntax_highlighting/injection.rs b/crates/ra_ide/src/syntax_highlighting/injection.rs
index bd38cdb6f..8c724af5b 100644
--- a/crates/ra_ide/src/syntax_highlighting/injection.rs
+++ b/crates/ra_ide/src/syntax_highlighting/injection.rs
@@ -150,9 +150,7 @@ pub(super) fn highlight_doc_comment(
     let (analysis, tmp_file_id) = Analysis::from_single_file(text);
 
     stack.push();
-    for mut h in analysis
-        .with_db(|db| super::highlight(db, tmp_file_id, None, true, Some(HighlightTag::Operator)))
-        .unwrap()
+    for mut h in analysis.with_db(|db| super::highlight(db, tmp_file_id, None, true, true)).unwrap()
     {
         // Determine start offset and end offset in case of multi-line ranges
         let mut start_offset = None;
diff --git a/crates/ra_ide/src/syntax_highlighting/tags.rs b/crates/ra_ide/src/syntax_highlighting/tags.rs
index f5ab73865..7f8e91e8d 100644
--- a/crates/ra_ide/src/syntax_highlighting/tags.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tags.rs
@@ -33,6 +33,7 @@ pub enum HighlightTag {
     Module,
     NumericLiteral,
     Operator,
+    Punctuation,
     SelfKeyword,
     SelfType,
     Static,
@@ -84,6 +85,7 @@ impl HighlightTag {
             HighlightTag::Module => "module",
             HighlightTag::NumericLiteral => "numeric_literal",
             HighlightTag::Operator => "operator",
+            HighlightTag::Punctuation => "punctuation",
             HighlightTag::SelfKeyword => "self_keyword",
             HighlightTag::SelfType => "self_type",
             HighlightTag::Static => "static",
-- 
cgit v1.2.3