From 05d67a9a0efafb3dd5087aad17d75aa88aa85178 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 1 Jul 2020 11:25:22 +0200
Subject: Move test data to test_data directory

---
 crates/ra_ide/test_data/highlight_injection.html | 47 ++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 crates/ra_ide/test_data/highlight_injection.html

(limited to 'crates/ra_ide/test_data/highlight_injection.html')

diff --git a/crates/ra_ide/test_data/highlight_injection.html b/crates/ra_ide/test_data/highlight_injection.html
new file mode 100644
index 000000000..1b0349bae
--- /dev/null
+++ b/crates/ra_ide/test_data/highlight_injection.html
@@ -0,0 +1,47 @@
+
+<style>
+body                { margin: 0; }
+pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
+
+.lifetime           { color: #DFAF8F; font-style: italic; }
+.comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
+.struct, .enum      { color: #7CB8BB; }
+.enum_variant       { color: #BDE0F3; }
+.string_literal     { color: #CC9393; }
+.field              { color: #94BFF3; }
+.function           { color: #93E0E3; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
+.parameter          { color: #94BFF3; }
+.text               { color: #DCDCCC; }
+.type               { color: #7CB8BB; }
+.builtin_type       { color: #8CD0D3; }
+.type_param         { color: #DFAF8F; }
+.attribute          { color: #94BFF3; }
+.numeric_literal    { color: #BFEBBF; }
+.bool_literal       { color: #BFE6EB; }
+.macro              { color: #94BFF3; }
+.module             { color: #AFD8AF; }
+.variable           { color: #DCDCCC; }
+.format_specifier   { color: #CC696B; }
+.mutable            { text-decoration: underline; }
+.unresolved_reference { color: #FC5555; }
+.escape_sequence    { color: #94BFF3; }
+
+.keyword            { color: #F0DFAF; font-weight: bold; }
+.keyword.unsafe     { color: #BC8383; font-weight: bold; }
+.control            { font-style: italic; }
+</style>
+<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span>(<span class="variable declaration">ra_fixture</span>: &<span class="builtin_type">str</span>) {}
+
+<span class="keyword">fn</span> <span class="function declaration">main</span>() {
+    <span class="function">fixture</span>(<span class="string_literal">r#"</span>
+        <span class="keyword">trait</span> <span class="trait declaration">Foo</span> {
+            <span class="keyword">fn</span> <span class="function declaration">foo</span>() {
+                <span class="macro">println!</span>(<span class="string_literal">"2 + 2 = {}"</span>, <span class="numeric_literal">4</span>);
+            }
+        }<span class="string_literal">"#</span>
+    );
+}</code></pre>
\ No newline at end of file
-- 
cgit v1.2.3


From e1d6b7f7c48d82c3c03550bc702e64cd7d079c99 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 11 Jul 2020 14:50:00 +0200
Subject: Use dedicated semantic highlight tag for parameters

closes #5106
---
 crates/ra_ide/test_data/highlight_injection.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'crates/ra_ide/test_data/highlight_injection.html')

diff --git a/crates/ra_ide/test_data/highlight_injection.html b/crates/ra_ide/test_data/highlight_injection.html
index 1b0349bae..e15234936 100644
--- a/crates/ra_ide/test_data/highlight_injection.html
+++ b/crates/ra_ide/test_data/highlight_injection.html
@@ -24,17 +24,18 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .bool_literal       { color: #BFE6EB; }
 .macro              { color: #94BFF3; }
 .module             { color: #AFD8AF; }
+.value_param        { color: #DCDCCC; }
 .variable           { color: #DCDCCC; }
 .format_specifier   { color: #CC696B; }
 .mutable            { text-decoration: underline; }
-.unresolved_reference { color: #FC5555; }
 .escape_sequence    { color: #94BFF3; }
-
 .keyword            { color: #F0DFAF; font-weight: bold; }
 .keyword.unsafe     { color: #BC8383; font-weight: bold; }
 .control            { font-style: italic; }
+
+.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span>(<span class="variable declaration">ra_fixture</span>: &<span class="builtin_type">str</span>) {}
+<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span>(<span class="value_param declaration">ra_fixture</span>: &<span class="builtin_type">str</span>) {}
 
 <span class="keyword">fn</span> <span class="function declaration">main</span>() {
     <span class="function">fixture</span>(<span class="string_literal">r#"</span>
-- 
cgit v1.2.3


From 33832d43fcc10fd6da0edf004d575f3576d9e91d Mon Sep 17 00:00:00 2001
From: Leander Tentrup <leander.tentrup@gmail.com>
Date: Mon, 13 Jul 2020 22:59:42 +0200
Subject: Highlight punctuation as `HighlightTag::Operator`

---
 crates/ra_ide/test_data/highlight_injection.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'crates/ra_ide/test_data/highlight_injection.html')

diff --git a/crates/ra_ide/test_data/highlight_injection.html b/crates/ra_ide/test_data/highlight_injection.html
index e15234936..62cba023d 100644
--- a/crates/ra_ide/test_data/highlight_injection.html
+++ b/crates/ra_ide/test_data/highlight_injection.html
@@ -35,14 +35,14 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span>(<span class="value_param declaration">ra_fixture</span>: &<span class="builtin_type">str</span>) {}
+<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span><span class="operator">(</span><span class="value_param declaration">ra_fixture</span><span class="operator">:</span> <span class="operator">&</span><span class="builtin_type">str</span><span class="operator">)</span> <span class="operator">{</span><span class="operator">}</span>
 
-<span class="keyword">fn</span> <span class="function declaration">main</span>() {
-    <span class="function">fixture</span>(<span class="string_literal">r#"</span>
-        <span class="keyword">trait</span> <span class="trait declaration">Foo</span> {
-            <span class="keyword">fn</span> <span class="function declaration">foo</span>() {
-                <span class="macro">println!</span>(<span class="string_literal">"2 + 2 = {}"</span>, <span class="numeric_literal">4</span>);
-            }
-        }<span class="string_literal">"#</span>
-    );
-}</code></pre>
\ No newline at end of file
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span>
+    <span class="function">fixture</span><span class="operator">(</span><span class="string_literal">r#"</span>
+        <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="operator">{</span>
+            <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span>
+                <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="operator">,</span> <span class="numeric_literal">4</span><span class="operator">)</span><span class="operator">;</span>
+            <span class="operator">}</span>
+        <span class="operator">}</span><span class="string_literal">"#</span>
+    <span class="operator">)</span><span class="operator">;</span>
+<span class="operator">}</span></code></pre>
\ No newline at end of file
-- 
cgit v1.2.3


From 119e71d9ea6448c49f597af3e0afefa6bf0f12ac Mon Sep 17 00:00:00 2001
From: Leander Tentrup <leander.tentrup@gmail.com>
Date: Wed, 15 Jul 2020 16:34:11 +0200
Subject: Add new `Punctuation` highlight tag

---
 crates/ra_ide/test_data/highlight_injection.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'crates/ra_ide/test_data/highlight_injection.html')

diff --git a/crates/ra_ide/test_data/highlight_injection.html b/crates/ra_ide/test_data/highlight_injection.html
index 62cba023d..461cfc437 100644
--- a/crates/ra_ide/test_data/highlight_injection.html
+++ b/crates/ra_ide/test_data/highlight_injection.html
@@ -35,14 +35,14 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span><span class="operator">(</span><span class="value_param declaration">ra_fixture</span><span class="operator">:</span> <span class="operator">&</span><span class="builtin_type">str</span><span class="operator">)</span> <span class="operator">{</span><span class="operator">}</span>
+<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span><span class="punctuation">(</span><span class="value_param declaration">ra_fixture</span><span class="punctuation">:</span> <span class="punctuation">&</span><span class="builtin_type">str</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
 
-<span class="keyword">fn</span> <span class="function declaration">main</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span>
-    <span class="function">fixture</span><span class="operator">(</span><span class="string_literal">r#"</span>
-        <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="operator">{</span>
-            <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="operator">(</span><span class="operator">)</span> <span class="operator">{</span>
-                <span class="macro">println!</span><span class="operator">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="operator">,</span> <span class="numeric_literal">4</span><span class="operator">)</span><span class="operator">;</span>
-            <span class="operator">}</span>
-        <span class="operator">}</span><span class="string_literal">"#</span>
-    <span class="operator">)</span><span class="operator">;</span>
-<span class="operator">}</span></code></pre>
\ No newline at end of file
+<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">fixture</span><span class="punctuation">(</span><span class="string_literal">r#"</span>
+        <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="punctuation">{</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="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="punctuation">,</span> <span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">;</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
-- 
cgit v1.2.3


From 54ebb2ce301813a9b5b48d5abe97ace370cfa617 Mon Sep 17 00:00:00 2001
From: GrayJack <gr41.j4ck@gmail.com>
Date: Mon, 20 Jul 2020 11:21:40 -0300
Subject: Handle semantic highlight when STAR is part of the `*{const, mut}`

---
 crates/ra_ide/test_data/highlight_injection.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_ide/test_data/highlight_injection.html')

diff --git a/crates/ra_ide/test_data/highlight_injection.html b/crates/ra_ide/test_data/highlight_injection.html
index 461cfc437..18addd00d 100644
--- a/crates/ra_ide/test_data/highlight_injection.html
+++ b/crates/ra_ide/test_data/highlight_injection.html
@@ -35,7 +35,7 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span><span class="punctuation">(</span><span class="value_param declaration">ra_fixture</span><span class="punctuation">:</span> <span class="punctuation">&</span><span class="builtin_type">str</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span><span class="punctuation">(</span><span class="value_param declaration">ra_fixture</span><span class="punctuation">:</span> <span class="operator">&</span><span class="builtin_type">str</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
 
 <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">fixture</span><span class="punctuation">(</span><span class="string_literal">r#"</span>
-- 
cgit v1.2.3