Skip to content

Commit 9464ca9

Browse files
matkladmatklad
committed
Fix highlighting test
1 parent 701cf43 commit 9464ca9

File tree

5 files changed

+55
-49
lines changed

5 files changed

+55
-49
lines changed

‎crates/ra_ide/src/snapshots/highlighting.html‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,70 +3,72 @@
33
body { margin: 0; }
44
pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
55

6+
67
.comment { color: #7F9F7F; }
7-
.string { color: #CC9393; }
8+
.struct, .enum { color: #7CB8BB; }
9+
.enum_variant { color: #BDE0F3; }
10+
.string_literal { color: #CC9393; }
811
.field { color: #94BFF3; }
912
.function { color: #93E0E3; }
1013
.parameter { color: #94BFF3; }
1114
.text { color: #DCDCCC; }
1215
.type { color: #7CB8BB; }
13-
.type.builtin { color: #8CD0D3; }
14-
.type.param { color: #20999D; }
16+
.builtin_type { color: #8CD0D3; }
17+
.type_param { color: #DFAF8F; }
1518
.attribute { color: #94BFF3; }
16-
.literal { color: #BFEBBF; }
17-
.literal.numeric { color: #6A8759; }
19+
.numeric_literal { color: #BFEBBF; }
1820
.macro { color: #94BFF3; }
1921
.module { color: #AFD8AF; }
2022
.variable { color: #DCDCCC; }
21-
.variable.mut { color: #DCDCCC; text-decoration: underline; }
23+
.mutable { text-decoration: underline; }
2224

23-
.keyword { color: #F0DFAF; }
24-
.keyword.unsafe { color: #DFAF8F; }
25-
.keyword.control { color: #F0DFAF; font-weight: bold; }
25+
.keyword { color: #F0DFAF; font-weight: bold; }
26+
.keyword.unsafe { color: #BC8383; font-weight: bold; }
27+
.control { font-style: italic; }
2628
</style>
2729
<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>
28-
<span class="keyword">struct</span> <span class="type">Foo</span> {
29-
<span class="keyword">pub</span> <span class="field">x</span>: <span class="type builtin">i32</span>,
30-
<span class="keyword">pub</span> <span class="field">y</span>: <span class="type builtin">i32</span>,
30+
<span class="keyword">struct</span> <span class="struct">Foo</span> {
31+
<span class="keyword">pub</span> <span class="field">x</span>: <span class="builtin_type">i32</span>,
32+
<span class="keyword">pub</span> <span class="field">y</span>: <span class="builtin_type">i32</span>,
3133
}
3234

33-
<span class="keyword">fn</span> <span class="function">foo</span>&lt;<span class="type param">T</span>&gt;() -&gt; <span class="type param">T</span> {
35+
<span class="keyword">fn</span> <span class="function">foo</span>&lt;<span class="type_param">T</span>&gt;() -&gt; <span class="type_param">T</span> {
3436
<span class="macro">unimplemented</span><span class="macro">!</span>();
35-
<span class="function">foo</span>::&lt;<span class="type builtin">i32</span>&gt;();
37+
<span class="function">foo</span>::&lt;<span class="builtin_type">i32</span>&gt;();
3638
}
3739

3840
<span class="macro">macro_rules</span><span class="macro">!</span> def_fn {
3941
($($tt:tt)*) =&gt; {$($tt)*}
4042
}
4143

42-
<span class="macro">def_fn</span><span class="macro">!</span>{
43-
<span class="keyword">fn</span> <span class="function">bar</span>() -&gt; <span class="type builtin">u32</span> {
44-
<span class="literal numeric">100</span>
44+
<span class="macro">def_fn</span><span class="macro">!</span> {
45+
<span class="keyword">fn</span> <span class="function">bar</span>() -&gt; <span class="builtin_type">u32</span> {
46+
<span class="numeric_literal">100</span>
4547
}
4648
}
4749

4850
<span class="comment">// comment</span>
4951
<span class="keyword">fn</span> <span class="function">main</span>() {
50-
<span class="macro">println</span><span class="macro">!</span>(<span class="string">"Hello, {}!"</span>, <span class="literal numeric">92</span>);
52+
<span class="macro">println</span><span class="macro">!</span>(<span class="string_literal">"Hello, {}!"</span>, <span class="numeric_literal">92</span>);
5153

5254
<span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable mutable">vec</span> = Vec::new();
5355
<span class="keyword control">if</span> <span class="keyword">true</span> {
54-
<span class="keyword">let</span> <span class="variable">x</span> = <span class="literal numeric">92</span>;
55-
<span class="variable mutable">vec</span>.push(<span class="type">Foo</span> { <span class="field">x</span>, <span class="field">y</span>: <span class="literal numeric">1</span> });
56+
<span class="keyword">let</span> <span class="variable">x</span> = <span class="numeric_literal">92</span>;
57+
<span class="variable mutable">vec</span>.push(<span class="struct">Foo</span> { <span class="field">x</span>, <span class="field">y</span>: <span class="numeric_literal">1</span> });
5658
}
57-
<span class="keyword unsafe">unsafe</span> { <span class="variable mutable">vec</span>.set_len(<span class="literal numeric">0</span>); }
59+
<span class="keyword unsafe">unsafe</span> { <span class="variable mutable">vec</span>.set_len(<span class="numeric_literal">0</span>); }
5860

59-
<span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable mutable">x</span> = <span class="literal numeric">42</span>;
61+
<span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable mutable">x</span> = <span class="numeric_literal">42</span>;
6062
<span class="keyword">let</span> <span class="variable mutable">y</span> = &<span class="keyword">mut</span> <span class="variable mutable">x</span>;
6163
<span class="keyword">let</span> <span class="variable">z</span> = &<span class="variable mutable">y</span>;
6264

6365
<span class="variable mutable">y</span>;
6466
}
6567

66-
<span class="keyword">enum</span> <span class="type">E</span>&lt;<span class="type param">X</span>&gt; {
67-
<span class="constant">V</span>(<span class="type param">X</span>)
68+
<span class="keyword">enum</span> <span class="enum">E</span>&lt;<span class="type_param">X</span>&gt; {
69+
<span class="enum_variant">V</span>(<span class="type_param">X</span>)
6870
}
6971

70-
<span class="keyword">impl</span>&lt;<span class="type param">X</span>&gt; <span class="type">E</span>&lt;<span class="type param">X</span>&gt; {
71-
<span class="keyword">fn</span> <span class="function">new</span>&lt;<span class="type param">T</span>&gt;() -&gt; <span class="type">E</span>&lt;<span class="type param">T</span>&gt; {}
72+
<span class="keyword">impl</span>&lt;<span class="type_param">X</span>&gt; <span class="enum">E</span>&lt;<span class="type_param">X</span>&gt; {
73+
<span class="keyword">fn</span> <span class="function">new</span>&lt;<span class="type_param">T</span>&gt;() -&gt; <span class="enum">E</span>&lt;<span class="type_param">T</span>&gt; {}
7274
}</code></pre>

‎crates/ra_ide/src/snapshots/rainbow_highlighting.html‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,38 @@
33
body { margin: 0; }
44
pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
55

6+
67
.comment { color: #7F9F7F; }
7-
.string { color: #CC9393; }
8+
.struct, .enum { color: #7CB8BB; }
9+
.enum_variant { color: #BDE0F3; }
10+
.string_literal { color: #CC9393; }
811
.field { color: #94BFF3; }
912
.function { color: #93E0E3; }
1013
.parameter { color: #94BFF3; }
1114
.text { color: #DCDCCC; }
1215
.type { color: #7CB8BB; }
13-
.type.builtin { color: #8CD0D3; }
14-
.type.param { color: #20999D; }
16+
.builtin_type { color: #8CD0D3; }
17+
.type_param { color: #DFAF8F; }
1518
.attribute { color: #94BFF3; }
16-
.literal { color: #BFEBBF; }
17-
.literal.numeric { color: #6A8759; }
19+
.numeric_literal { color: #BFEBBF; }
1820
.macro { color: #94BFF3; }
1921
.module { color: #AFD8AF; }
2022
.variable { color: #DCDCCC; }
21-
.variable.mut { color: #DCDCCC; text-decoration: underline; }
23+
.mutable { text-decoration: underline; }
2224

23-
.keyword { color: #F0DFAF; }
24-
.keyword.unsafe { color: #DFAF8F; }
25-
.keyword.control { color: #F0DFAF; font-weight: bold; }
25+
.keyword { color: #F0DFAF; font-weight: bold; }
26+
.keyword.unsafe { color: #BC8383; font-weight: bold; }
27+
.control { font-style: italic; }
2628
</style>
2729
<pre><code><span class="keyword">fn</span> <span class="function">main</span>() {
28-
<span class="keyword">let</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> = <span class="string">"hello"</span>;
30+
<span class="keyword">let</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> = <span class="string_literal">"hello"</span>;
2931
<span class="keyword">let</span> <span class="variable" data-binding-hash="2705725358298919760" style="color: hsl(17,51%,74%);">x</span> = <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span>.to_string();
3032
<span class="keyword">let</span> <span class="variable" data-binding-hash="3365759661443752373" style="color: hsl(127,76%,66%);">y</span> = <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span>.to_string();
3133

32-
<span class="keyword">let</span> <span class="variable" data-binding-hash="794745962933817518" style="color: hsl(19,74%,76%);">x</span> = <span class="string">"other color please!"</span>;
34+
<span class="keyword">let</span> <span class="variable" data-binding-hash="794745962933817518" style="color: hsl(19,74%,76%);">x</span> = <span class="string_literal">"other color please!"</span>;
3335
<span class="keyword">let</span> <span class="variable" data-binding-hash="6717528807933952652" style="color: hsl(85,49%,84%);">y</span> = <span class="variable" data-binding-hash="794745962933817518" style="color: hsl(19,74%,76%);">x</span>.to_string();
3436
}
3537

3638
<span class="keyword">fn</span> <span class="function">bar</span>() {
37-
<span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable mutable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> = <span class="string">"hello"</span>;
39+
<span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable mutable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> = <span class="string_literal">"hello"</span>;
3840
}</code></pre>

‎crates/ra_ide/src/syntax_highlighting/html.rs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,27 @@ const STYLE: &str = "
8080
body { margin: 0; }
8181
pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
8282
83+
8384
.comment { color: #7F9F7F; }
84-
.string { color: #CC9393; }
85+
.struct, .enum { color: #7CB8BB; }
86+
.enum_variant { color: #BDE0F3; }
87+
.string_literal { color: #CC9393; }
8588
.field { color: #94BFF3; }
8689
.function { color: #93E0E3; }
8790
.parameter { color: #94BFF3; }
8891
.text { color: #DCDCCC; }
8992
.type { color: #7CB8BB; }
90-
.type.builtin { color: #8CD0D3; }
91-
.type.param { color: #20999D; }
93+
.builtin_type { color: #8CD0D3; }
94+
.type_param { color: #DFAF8F; }
9295
.attribute { color: #94BFF3; }
93-
.literal { color: #BFEBBF; }
94-
.literal.numeric { color: #6A8759; }
96+
.numeric_literal { color: #BFEBBF; }
9597
.macro { color: #94BFF3; }
9698
.module { color: #AFD8AF; }
9799
.variable { color: #DCDCCC; }
98-
.variable.mut { color: #DCDCCC; text-decoration: underline; }
100+
.mutable { text-decoration: underline; }
99101
100-
.keyword { color: #F0DFAF; }
101-
.keyword.unsafe { color: #DFAF8F; }
102-
.keyword.control { color: #F0DFAF; font-weight: bold; }
102+
.keyword { color: #F0DFAF; font-weight: bold; }
103+
.keyword.unsafe { color: #BC8383; font-weight: bold; }
104+
.control { font-style: italic; }
103105
</style>
104106
";

‎crates/ra_ide/src/syntax_highlighting/tags.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl HighlightTag {
7272
HighlightTag::NumericLiteral => "numeric_literal",
7373
HighlightTag::SelfType => "self_type",
7474
HighlightTag::Static => "static",
75-
HighlightTag::StringLiteral => "string",
75+
HighlightTag::StringLiteral => "string_literal",
7676
HighlightTag::Struct => "struct",
7777
HighlightTag::Trait => "trait",
7878
HighlightTag::TypeAlias => "type_alias",

‎crates/ra_ide/src/syntax_highlighting/tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ macro_rules! def_fn {
2626
($($tt:tt)*) => {$($tt)*}
2727
}
2828
29-
def_fn!{
29+
def_fn! {
3030
fn bar() -> u32 {
3131
100
3232
}

0 commit comments

Comments
 (0)