Skip to content

Commit 2995fd2

Browse files
bors[bot]matklad
bors[bot]
and
matklad
authored
Merge #3363
3363: Cleanup highlighting tags r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
2 parents 7e5cfcd + 9464ca9 commit 2995fd2

File tree

9 files changed

+231
-156
lines changed

9 files changed

+231
-156
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.rs‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,11 @@ fn highlight_element(
177177
}
178178
};
179179

180-
match name_kind {
180+
let h = match name_kind {
181181
Some(name_kind) => highlight_name(db, name_kind),
182182
None => highlight_name_by_syntax(name),
183-
}
183+
};
184+
h | HighlightModifier::Definition
184185
}
185186

186187
// Highlight references like the definitions they resolve to
@@ -206,12 +207,13 @@ fn highlight_element(
206207

207208
// Simple token-based highlighting
208209
COMMENT => HighlightTag::Comment.into(),
209-
STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => HighlightTag::LiteralString.into(),
210+
STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => HighlightTag::StringLiteral.into(),
210211
ATTR => HighlightTag::Attribute.into(),
211-
INT_NUMBER | FLOAT_NUMBER => HighlightTag::LiteralNumeric.into(),
212-
BYTE => HighlightTag::LiteralByte.into(),
213-
CHAR => HighlightTag::LiteralChar.into(),
214-
LIFETIME => HighlightTag::TypeLifetime.into(),
212+
INT_NUMBER | FLOAT_NUMBER => HighlightTag::NumericLiteral.into(),
213+
BYTE => HighlightTag::ByteLiteral.into(),
214+
CHAR => HighlightTag::CharLiteral.into(),
215+
// FIXME: set Declaration for decls
216+
LIFETIME => HighlightTag::Lifetime.into(),
215217

216218
k if k.is_keyword() => {
217219
let h = Highlight::new(HighlightTag::Keyword);
@@ -255,20 +257,21 @@ fn highlight_name(db: &RootDatabase, def: NameDefinition) -> Highlight {
255257
NameDefinition::ModuleDef(def) => match def {
256258
hir::ModuleDef::Module(_) => HighlightTag::Module,
257259
hir::ModuleDef::Function(_) => HighlightTag::Function,
258-
hir::ModuleDef::Adt(_) => HighlightTag::Type,
259-
hir::ModuleDef::EnumVariant(_) => HighlightTag::Constant,
260+
hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Struct,
261+
hir::ModuleDef::Adt(hir::Adt::Enum(_)) => HighlightTag::Enum,
262+
hir::ModuleDef::Adt(hir::Adt::Union(_)) => HighlightTag::Union,
263+
hir::ModuleDef::EnumVariant(_) => HighlightTag::EnumVariant,
260264
hir::ModuleDef::Const(_) => HighlightTag::Constant,
261-
hir::ModuleDef::Static(_) => HighlightTag::Constant,
262-
hir::ModuleDef::Trait(_) => HighlightTag::Type,
263-
hir::ModuleDef::TypeAlias(_) => HighlightTag::Type,
264-
hir::ModuleDef::BuiltinType(_) => {
265-
return HighlightTag::Type | HighlightModifier::Builtin
266-
}
265+
hir::ModuleDef::Static(_) => HighlightTag::Static,
266+
hir::ModuleDef::Trait(_) => HighlightTag::Trait,
267+
hir::ModuleDef::TypeAlias(_) => HighlightTag::TypeAlias,
268+
hir::ModuleDef::BuiltinType(_) => HighlightTag::BuiltinType,
267269
},
268-
NameDefinition::SelfType(_) => HighlightTag::TypeSelf,
270+
NameDefinition::SelfType(_) => HighlightTag::SelfType,
269271
NameDefinition::TypeParam(_) => HighlightTag::TypeParam,
272+
// FIXME: distinguish between locals and parameters
270273
NameDefinition::Local(local) => {
271-
let mut h = Highlight::new(HighlightTag::Variable);
274+
let mut h = Highlight::new(HighlightTag::Local);
272275
if local.is_mut(db) || local.ty(db).is_mutable_reference() {
273276
h |= HighlightModifier::Mutable;
274277
}
@@ -287,7 +290,11 @@ fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
287290
};
288291

289292
match parent.kind() {
290-
STRUCT_DEF | ENUM_DEF | TRAIT_DEF | TYPE_ALIAS_DEF => HighlightTag::Type.into(),
293+
STRUCT_DEF => HighlightTag::Struct.into(),
294+
ENUM_DEF => HighlightTag::Enum.into(),
295+
UNION_KW => HighlightTag::Union.into(),
296+
TRAIT_DEF => HighlightTag::Trait.into(),
297+
TYPE_ALIAS_DEF => HighlightTag::TypeAlias.into(),
291298
TYPE_PARAM => HighlightTag::TypeParam.into(),
292299
RECORD_FIELD_DEF => HighlightTag::Field.into(),
293300
_ => default,
@@ -312,7 +319,7 @@ fn highlight_injection(
312319
if let Some(range) = literal.open_quote_text_range() {
313320
acc.push(HighlightedRange {
314321
range,
315-
highlight: HighlightTag::LiteralString.into(),
322+
highlight: HighlightTag::StringLiteral.into(),
316323
binding_hash: None,
317324
})
318325
}
@@ -327,7 +334,7 @@ fn highlight_injection(
327334
if let Some(range) = literal.close_quote_text_range() {
328335
acc.push(HighlightedRange {
329336
range,
330-
highlight: HighlightTag::LiteralString.into(),
337+
highlight: HighlightTag::StringLiteral.into(),
331338
binding_hash: None,
332339
})
333340
}

‎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
";

0 commit comments

Comments
 (0)