Merge #1546

1546: prettier colors r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2019-07-18 17:57:49 +0100
committer: bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2019-07-18 17:57:49 +0100
commit: 092936f20a8bd775324c15375f0415dcc7814f9a (patch)
tree: eebb8d402bcaf8d0badfbb12167f691e2270dab1
parent: 8a6d270ecc26b59ad7ab0a207a963dc14f7bf81b (diff)
parent: 2c4c233ba83606f9eba7000090139fdedd7eba65 (diff)
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; }
+.attribute          { color: #94BFF3; }
-.literal            { color: #DFAF8F; }
+.literal            { color: #BFEBBF; }
-.macro              { color: #DFAF8F; }
+.macro              { color: #94BFF3; }
-.variable\.mut     { color: #DFAF8F; }
+.variable           { color: #DCDCCC; }
+.variable\.mut     { color: #DCDCCC; text-decoration: underline; }
 .keyword            { color: #F0DFAF; }
-.keyword\.unsafe   { color: #F0DFAF; font-weight: bold; }
+.keyword\.unsafe   { color: #DFAF8F; }
-.keyword\.control  { color: #DC8CC3; }
+.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; }
+.attribute          { color: #94BFF3; }
-.literal            { color: #DFAF8F; }
+.literal            { color: #BFEBBF; }
-.macro              { color: #DFAF8F; }
+.macro              { color: #94BFF3; }
-.variable\.mut     { color: #DFAF8F; }
+.variable           { color: #DCDCCC; }
+.variable\.mut     { color: #DCDCCC; text-decoration: underline; }
 .keyword            { color: #F0DFAF; }
-.keyword\.unsafe   { color: #F0DFAF; font-weight: bold; }
+.keyword\.unsafe   { color: #DFAF8F; }
-.keyword\.control  { color: #DC8CC3; }
+.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; }
+.attribute          { color: #94BFF3; }
-.literal            { color: #DFAF8F; }
+.literal            { color: #BFEBBF; }
-.macro              { color: #DFAF8F; }
+.macro              { color: #94BFF3; }
-.variable\\.mut     { color: #DFAF8F; }
+.variable           { color: #DCDCCC; }
+.variable\\.mut     { color: #DCDCCC; text-decoration: underline; }
 .keyword            { color: #F0DFAF; }
-.keyword\\.unsafe   { color: #F0DFAF; font-weight: bold; }
+.keyword\\.unsafe   { color: #DFAF8F; }
-.keyword\\.control  { color: #DC8CC3; }
+.keyword\\.control  { color: #F0DFAF; font-weight: bold; }
 </style>
 ";
author	bors[bot] <26634292+bors[bot]@users.noreply.github.com>	2019-07-18 17:57:49 +0100
committer	bors[bot] <26634292+bors[bot]@users.noreply.github.com>	2019-07-18 17:57:49 +0100
commit	092936f20a8bd775324c15375f0415dcc7814f9a (patch)
tree	eebb8d402bcaf8d0badfbb12167f691e2270dab1
parent	8a6d270ecc26b59ad7ab0a207a963dc14f7bf81b (diff)
parent	2c4c233ba83606f9eba7000090139fdedd7eba65 (diff)

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
9	.parameter { color: #94BFF3; }	9	.parameter { color: #94BFF3; }
10	.builtin { color: #DD6718; }	10	.builtin { color: #DD6718; }
11	.text { color: #DCDCCC; }	11	.text { color: #DCDCCC; }
12	.attribute { color: #BFEBBF; }	12	.attribute { color: #94BFF3; }
13	.literal { color: #DFAF8F; }	13	.literal { color: #BFEBBF; }
14	.macro { color: #DFAF8F; }	14	.macro { color: #94BFF3; }
15	.variable\.mut { color: #DFAF8F; }	15	.variable { color: #DCDCCC; }
		16	.variable\.mut { color: #DCDCCC; text-decoration: underline; }
16		17
17	.keyword { color: #F0DFAF; }	18	.keyword { color: #F0DFAF; }
18	.keyword\.unsafe { color: #F0DFAF; font-weight: bold; }	19	.keyword\.unsafe { color: #DFAF8F; }
19	.keyword\.control { color: #DC8CC3; }	20	.keyword\.control { color: #F0DFAF; font-weight: bold; }
20	</style>	21	</style>
21	<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>	22	<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>
22	<span class="keyword">struct</span> <span class="type">Foo</span> {	23	<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
9	.parameter { color: #94BFF3; }	9	.parameter { color: #94BFF3; }
10	.builtin { color: #DD6718; }	10	.builtin { color: #DD6718; }
11	.text { color: #DCDCCC; }	11	.text { color: #DCDCCC; }
12	.attribute { color: #BFEBBF; }	12	.attribute { color: #94BFF3; }
13	.literal { color: #DFAF8F; }	13	.literal { color: #BFEBBF; }
14	.macro { color: #DFAF8F; }	14	.macro { color: #94BFF3; }
15	.variable\.mut { color: #DFAF8F; }	15	.variable { color: #DCDCCC; }
		16	.variable\.mut { color: #DCDCCC; text-decoration: underline; }
16		17
17	.keyword { color: #F0DFAF; }	18	.keyword { color: #F0DFAF; }
18	.keyword\.unsafe { color: #F0DFAF; font-weight: bold; }	19	.keyword\.unsafe { color: #DFAF8F; }
19	.keyword\.control { color: #DC8CC3; }	20	.keyword\.control { color: #F0DFAF; font-weight: bold; }
20	</style>	21	</style>
21	<pre><code><span class="keyword">fn</span> <span class="function">main</span>() {	22	<pre><code><span class="keyword">fn</span> <span class="function">main</span>() {
22	<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>;	23	<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
283	.parameter { color: #94BFF3; }	283	.parameter { color: #94BFF3; }
284	.builtin { color: #DD6718; }	284	.builtin { color: #DD6718; }
285	.text { color: #DCDCCC; }	285	.text { color: #DCDCCC; }
286	.attribute { color: #BFEBBF; }	286	.attribute { color: #94BFF3; }
287	.literal { color: #DFAF8F; }	287	.literal { color: #BFEBBF; }
288	.macro { color: #DFAF8F; }	288	.macro { color: #94BFF3; }
289	.variable\\.mut { color: #DFAF8F; }	289	.variable { color: #DCDCCC; }
		290	.variable\\.mut { color: #DCDCCC; text-decoration: underline; }
290		291
291	.keyword { color: #F0DFAF; }	292	.keyword { color: #F0DFAF; }
292	.keyword\\.unsafe { color: #F0DFAF; font-weight: bold; }	293	.keyword\\.unsafe { color: #DFAF8F; }
293	.keyword\\.control { color: #DC8CC3; }	294	.keyword\\.control { color: #F0DFAF; font-weight: bold; }
294	</style>	295	</style>
295	";	296	";
296		297