Merge #1546

1546: prettier colors r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

3 files changed, 21 insertions, 18 deletions

diff --git a/crates/ra_ide_api/src/snapshots/highlighting.html b/crates/ra_ide_api/src/snapshots/highlighting.html
index 709816d0d..af7b4a0d0 100644
--- a/crates/ra_ide_api/src/snapshots/highlighting.html
+++ b/crates/ra_ide_api/src/snapshots/highlighting.html
@@ -9,14 +9,15 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .parameter          { color: #94BFF3; }
 .builtin            { color: #DD6718; }
 .text               { color: #DCDCCC; }
-.attribute          { color: #BFEBBF; }
-.literal            { color: #DFAF8F; }
-.macro              { color: #DFAF8F; }
-.variable\.mut     { color: #DFAF8F; }
+.attribute          { color: #94BFF3; }
+.literal            { color: #BFEBBF; }
+.macro              { color: #94BFF3; }
+.variable           { color: #DCDCCC; }
+.variable\.mut     { color: #DCDCCC; text-decoration: underline; }
 
 .keyword            { color: #F0DFAF; }
-.keyword\.unsafe   { color: #F0DFAF; font-weight: bold; }
-.keyword\.control  { color: #DC8CC3; }
+.keyword\.unsafe   { color: #DFAF8F; }
+.keyword\.control  { color: #F0DFAF; font-weight: bold; }
 </style>
 <pre><code><span class="attribute">#</span><span class="attribute">[</span><span class="attribute">derive</span><span class="attribute">(</span><span class="attribute">Clone</span><span class="attribute">,</span><span class="attribute"> </span><span class="attribute">Debug</span><span class="attribute">)</span><span class="attribute">]</span>
 <span class="keyword">struct</span> <span class="type">Foo</span> {
diff --git a/crates/ra_ide_api/src/snapshots/rainbow_highlighting.html b/crates/ra_ide_api/src/snapshots/rainbow_highlighting.html
index ad3935b5d..c625d47bf 100644
--- a/crates/ra_ide_api/src/snapshots/rainbow_highlighting.html
+++ b/crates/ra_ide_api/src/snapshots/rainbow_highlighting.html
@@ -9,14 +9,15 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .parameter          { color: #94BFF3; }
 .builtin            { color: #DD6718; }
 .text               { color: #DCDCCC; }
-.attribute          { color: #BFEBBF; }
-.literal            { color: #DFAF8F; }
-.macro              { color: #DFAF8F; }
-.variable\.mut     { color: #DFAF8F; }
+.attribute          { color: #94BFF3; }
+.literal            { color: #BFEBBF; }
+.macro              { color: #94BFF3; }
+.variable           { color: #DCDCCC; }
+.variable\.mut     { color: #DCDCCC; text-decoration: underline; }
 
 .keyword            { color: #F0DFAF; }
-.keyword\.unsafe   { color: #F0DFAF; font-weight: bold; }
-.keyword\.control  { color: #DC8CC3; }
+.keyword\.unsafe   { color: #DFAF8F; }
+.keyword\.control  { color: #F0DFAF; font-weight: bold; }
 </style>
 <pre><code><span class="keyword">fn</span> <span class="function">main</span>() {
     <span class="keyword">let</span> <span class="variable" data-binding-hash="3888301305669440875" style="color: hsl(242,59%,59%);">hello</span> = <span class="string">"hello"</span>;
diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index d84ae2cb2..3ea26f58b 100644
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -283,14 +283,15 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .parameter          { color: #94BFF3; }
 .builtin            { color: #DD6718; }
 .text               { color: #DCDCCC; }
-.attribute          { color: #BFEBBF; }
-.literal            { color: #DFAF8F; }
-.macro              { color: #DFAF8F; }
-.variable\\.mut     { color: #DFAF8F; }
+.attribute          { color: #94BFF3; }
+.literal            { color: #BFEBBF; }
+.macro              { color: #94BFF3; }
+.variable           { color: #DCDCCC; }
+.variable\\.mut     { color: #DCDCCC; text-decoration: underline; }
 
 .keyword            { color: #F0DFAF; }
-.keyword\\.unsafe   { color: #F0DFAF; font-weight: bold; }
-.keyword\\.control  { color: #DC8CC3; }
+.keyword\\.unsafe   { color: #DFAF8F; }
+.keyword\\.control  { color: #F0DFAF; font-weight: bold; }
 </style>
 ";