From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 9 Jan 2021 13:07:41 +0000 (+0300)
Subject: Better highlight for fixtures
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=4a8d2c098d88da6f36f3cf95f424b471987c5daa;p=rust.git

Better highlight for fixtures
---

diff --git a/crates/ide/src/syntax_highlighting/injection.rs b/crates/ide/src/syntax_highlighting/injection.rs
index de2180b047c..008d5ce244d 100644
--- a/crates/ide/src/syntax_highlighting/injection.rs
+++ b/crates/ide/src/syntax_highlighting/injection.rs
@@ -42,6 +42,10 @@ pub(super) fn highlight_injection(
         offset += TextSize::of(chunk);
 
         if let Some(next) = text.strip_prefix(marker) {
+            if let Some(range) = literal.map_range_up(TextRange::at(offset, TextSize::of(marker))) {
+                hl.add(HlRange { range, highlight: HlTag::Keyword.into(), binding_hash: None });
+            }
+
             text = next;
 
             let marker_len = TextSize::of(marker);
diff --git a/crates/ide/src/syntax_highlighting/test_data/injection.html b/crates/ide/src/syntax_highlighting/test_data/injection.html
index a54d303b464..6703a84e5db 100644
--- a/crates/ide/src/syntax_highlighting/test_data/injection.html
+++ b/crates/ide/src/syntax_highlighting/test_data/injection.html
@@ -40,9 +40,9 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 <span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
     <span class="function">f</span><span class="punctuation">(</span><span class="string_literal">r"</span>
 <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-    <span class="function">foo</span><span class="punctuation">(</span>$0<span class="punctuation">{</span>
+    <span class="function">foo</span><span class="punctuation">(</span><span class="keyword">$0</span><span class="punctuation">{</span>
         <span class="numeric_literal">92</span>
-    <span class="punctuation">}</span>$0<span class="punctuation">)</span>
+    <span class="punctuation">}</span><span class="keyword">$0</span><span class="punctuation">)</span>
 <span class="punctuation">}</span><span class="string_literal">"</span><span class="punctuation">)</span><span class="punctuation">;</span>
 <span class="punctuation">}</span>
     </code></pre>
\ No newline at end of file