Skip to content

Commit 36603e0

Browse files
VeykrilVeykril
committed
Rename test highlighting output files
1 parent c99fb4b commit 36603e0

File tree

7 files changed

+176
-85
lines changed

7 files changed

+176
-85
lines changed

‎crates/ide/src/syntax_highlighting/test_data/highlight_attributes.html

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
2+
<style>
3+
body { margin: 0; }
4+
pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
5+
6+
.lifetime { color: #DFAF8F; font-style: italic; }
7+
.label { color: #DFAF8F; font-style: italic; }
8+
.comment { color: #7F9F7F; }
9+
.documentation { color: #629755; }
10+
.intra_doc_link { font-style: italic; }
11+
.injected { opacity: 0.65 ; }
12+
.struct, .enum { color: #7CB8BB; }
13+
.enum_variant { color: #BDE0F3; }
14+
.string_literal { color: #CC9393; }
15+
.field { color: #94BFF3; }
16+
.function { color: #93E0E3; }
17+
.function.unsafe { color: #BC8383; }
18+
.trait.unsafe { color: #BC8383; }
19+
.operator.unsafe { color: #BC8383; }
20+
.mutable.unsafe { color: #BC8383; text-decoration: underline; }
21+
.keyword.unsafe { color: #BC8383; font-weight: bold; }
22+
.parameter { color: #94BFF3; }
23+
.text { color: #DCDCCC; }
24+
.type { color: #7CB8BB; }
25+
.builtin_type { color: #8CD0D3; }
26+
.type_param { color: #DFAF8F; }
27+
.attribute { color: #94BFF3; }
28+
.numeric_literal { color: #BFEBBF; }
29+
.bool_literal { color: #BFE6EB; }
30+
.macro { color: #94BFF3; }
31+
.derive { color: #94BFF3; font-style: italic; }
32+
.module { color: #AFD8AF; }
33+
.value_param { color: #DCDCCC; }
34+
.variable { color: #DCDCCC; }
35+
.format_specifier { color: #CC696B; }
36+
.mutable { text-decoration: underline; }
37+
.escape_sequence { color: #94BFF3; }
38+
.keyword { color: #F0DFAF; font-weight: bold; }
39+
.control { font-style: italic; }
40+
.reference { font-style: italic; font-weight: bold; }
41+
42+
.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
43+
</style>
44+
<pre><code><span class="attribute_bracket attribute">#</span><span class="attribute_bracket attribute">[</span><span class="builtin_attr attribute library">allow</span><span class="parenthesis attribute">(</span><span class="none attribute">dead_code</span><span class="parenthesis attribute">)</span><span class="attribute_bracket attribute">]</span>
45+
<span class="attribute_bracket attribute">#</span><span class="attribute_bracket attribute">[</span><span class="tool_module attribute library">rustfmt</span><span class="operator attribute">::</span><span class="tool_module attribute library">skip</span><span class="attribute_bracket attribute">]</span>
46+
<span class="attribute_bracket attribute">#</span><span class="attribute_bracket attribute">[</span><span class="module attribute crate_root library">proc_macros</span><span class="operator attribute">::</span><span class="attribute attribute library">identity</span><span class="attribute_bracket attribute">]</span>
47+
<span class="attribute_bracket attribute">#</span><span class="attribute_bracket attribute">[</span><span class="attribute attribute default_library library">derive</span><span class="parenthesis attribute">(</span><span class="derive attribute default_library library">Copy</span><span class="parenthesis attribute">)</span><span class="attribute_bracket attribute">]</span>
48+
<span class="comment documentation">/// This is a doc comment</span>
49+
<span class="comment">// This is a normal comment</span>
50+
<span class="comment documentation">/// This is a doc comment</span>
51+
<span class="attribute_bracket attribute">#</span><span class="attribute_bracket attribute">[</span><span class="attribute attribute default_library library">derive</span><span class="parenthesis attribute">(</span><span class="derive attribute default_library library">Copy</span><span class="parenthesis attribute">)</span><span class="attribute_bracket attribute">]</span>
52+
<span class="comment">// This is another normal comment</span>
53+
<span class="comment documentation">/// This is another doc comment</span>
54+
<span class="comment">// This is another normal comment</span>
55+
<span class="attribute_bracket attribute">#</span><span class="attribute_bracket attribute">[</span><span class="attribute attribute default_library library">derive</span><span class="parenthesis attribute">(</span><span class="derive attribute default_library library">Copy</span><span class="parenthesis attribute">)</span><span class="attribute_bracket attribute">]</span>
56+
<span class="comment">// The reason for these being here is to test AttrIds</span>
57+
<span class="keyword">struct</span> <span class="struct declaration">Foo</span><span class="semicolon">;</span></code></pre>

‎crates/ide/src/syntax_highlighting/test_data/highlighting.html renamed to ‎crates/ide/src/syntax_highlighting/test_data/highlight_general.html

File renamed without changes.

‎crates/ide/src/syntax_highlighting/test_data/highlight_injection.html

+12-5
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,17 @@
4545

4646
<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
4747
<span class="function">fixture</span><span class="parenthesis">(</span><span class="string_literal">r#"</span>
48-
<span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="brace">{</span>
49-
<span class="keyword">fn</span> <span class="function associated declaration static trait">foo</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
50-
<span class="unresolved_reference">println</span><span class="macro_bang">!</span><span class="parenthesis">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="comma">,</span> <span class="numeric_literal">4</span><span class="parenthesis">)</span><span class="semicolon">;</span>
51-
<span class="brace">}</span>
52-
<span class="brace">}</span><span class="string_literal">"#</span>
48+
<span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="brace">{</span>
49+
<span class="keyword">fn</span> <span class="function associated declaration static trait">foo</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
50+
<span class="unresolved_reference">println</span><span class="macro_bang">!</span><span class="parenthesis">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="comma">,</span> <span class="numeric_literal">4</span><span class="parenthesis">)</span><span class="semicolon">;</span>
51+
<span class="brace">}</span>
52+
<span class="brace">}</span><span class="string_literal">"#</span>
53+
<span class="parenthesis">)</span><span class="semicolon">;</span>
54+
<span class="function">fixture</span><span class="parenthesis">(</span><span class="string_literal">r"</span>
55+
<span class="keyword">fn</span> <span class="function declaration">foo</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
56+
<span class="function">foo</span><span class="parenthesis">(</span><span class="keyword">$0</span><span class="brace">{</span>
57+
<span class="numeric_literal">92</span>
58+
<span class="brace">}</span><span class="keyword">$0</span><span class="parenthesis">)</span>
59+
<span class="brace">}</span><span class="string_literal">"</span>
5360
<span class="parenthesis">)</span><span class="semicolon">;</span>
5461
<span class="brace">}</span></code></pre>

‎crates/ide/src/syntax_highlighting/test_data/highlight_macros.html

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
2+
<style>
3+
body { margin: 0; }
4+
pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
5+
6+
.lifetime { color: #DFAF8F; font-style: italic; }
7+
.label { color: #DFAF8F; font-style: italic; }
8+
.comment { color: #7F9F7F; }
9+
.documentation { color: #629755; }
10+
.intra_doc_link { font-style: italic; }
11+
.injected { opacity: 0.65 ; }
12+
.struct, .enum { color: #7CB8BB; }
13+
.enum_variant { color: #BDE0F3; }
14+
.string_literal { color: #CC9393; }
15+
.field { color: #94BFF3; }
16+
.function { color: #93E0E3; }
17+
.function.unsafe { color: #BC8383; }
18+
.trait.unsafe { color: #BC8383; }
19+
.operator.unsafe { color: #BC8383; }
20+
.mutable.unsafe { color: #BC8383; text-decoration: underline; }
21+
.keyword.unsafe { color: #BC8383; font-weight: bold; }
22+
.parameter { color: #94BFF3; }
23+
.text { color: #DCDCCC; }
24+
.type { color: #7CB8BB; }
25+
.builtin_type { color: #8CD0D3; }
26+
.type_param { color: #DFAF8F; }
27+
.attribute { color: #94BFF3; }
28+
.numeric_literal { color: #BFEBBF; }
29+
.bool_literal { color: #BFE6EB; }
30+
.macro { color: #94BFF3; }
31+
.derive { color: #94BFF3; font-style: italic; }
32+
.module { color: #AFD8AF; }
33+
.value_param { color: #DCDCCC; }
34+
.variable { color: #DCDCCC; }
35+
.format_specifier { color: #CC696B; }
36+
.mutable { text-decoration: underline; }
37+
.escape_sequence { color: #94BFF3; }
38+
.keyword { color: #F0DFAF; font-weight: bold; }
39+
.control { font-style: italic; }
40+
.reference { font-style: italic; font-weight: bold; }
41+
42+
.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
43+
</style>
44+
<pre><code><span class="module crate_root library">proc_macros</span><span class="operator">::</span><span class="macro library">mirror</span><span class="macro_bang">!</span> <span class="brace">{</span>
45+
<span class="brace">{</span>
46+
<span class="comma">,</span><span class="builtin_type">i32</span> <span class="colon">:</span><span class="field declaration public">x</span> <span class="keyword">pub</span>
47+
<span class="comma">,</span><span class="builtin_type">i32</span> <span class="colon">:</span><span class="field declaration public">y</span> <span class="keyword">pub</span>
48+
<span class="brace">}</span> <span class="struct declaration">Foo</span> <span class="keyword">struct</span>
49+
<span class="brace">}</span>
50+
<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">def_fn</span> <span class="brace">{</span>
51+
<span class="parenthesis">(</span><span class="punctuation">$</span><span class="parenthesis">(</span><span class="punctuation">$</span>tt<span class="colon">:</span>tt<span class="parenthesis">)</span><span class="punctuation">*</span><span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="punctuation">$</span><span class="parenthesis">(</span><span class="punctuation">$</span>tt<span class="parenthesis">)</span><span class="punctuation">*</span><span class="brace">}</span>
52+
<span class="brace">}</span>
53+
54+
<span class="macro">def_fn</span><span class="macro_bang">!</span> <span class="brace">{</span>
55+
<span class="keyword">fn</span> <span class="function declaration">bar</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">-</span><span class="operator">&gt;</span> <span class="builtin_type">u32</span> <span class="brace">{</span>
56+
<span class="numeric_literal">100</span>
57+
<span class="brace">}</span>
58+
<span class="brace">}</span>
59+
60+
<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">dont_color_me_braces</span> <span class="brace">{</span>
61+
<span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="numeric_literal">0</span><span class="brace">}</span>
62+
<span class="brace">}</span>
63+
64+
<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">noop</span> <span class="brace">{</span>
65+
<span class="parenthesis">(</span><span class="punctuation">$</span>expr<span class="colon">:</span>expr<span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span>
66+
<span class="punctuation">$</span>expr
67+
<span class="brace">}</span>
68+
<span class="brace">}</span>
69+
70+
<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">keyword_frag</span> <span class="brace">{</span>
71+
<span class="parenthesis">(</span><span class="punctuation">$</span>type<span class="colon">:</span>ty<span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="parenthesis">(</span><span class="punctuation">$</span>type<span class="parenthesis">)</span>
72+
<span class="brace">}</span>
73+
74+
<span class="keyword">macro</span> <span class="macro declaration">with_args</span><span class="parenthesis">(</span><span class="punctuation">$</span>i<span class="colon">:</span>ident<span class="parenthesis">)</span> <span class="brace">{</span>
75+
<span class="punctuation">$</span>i
76+
<span class="brace">}</span>
77+
78+
<span class="keyword">macro</span> <span class="macro declaration">without_args</span> <span class="brace">{</span>
79+
<span class="parenthesis">(</span><span class="punctuation">$</span>i<span class="colon">:</span>ident<span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span>
80+
<span class="punctuation">$</span>i
81+
<span class="brace">}</span>
82+
<span class="brace">}</span>
83+
84+
<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
85+
<span class="unresolved_reference">println</span><span class="macro_bang">!</span><span class="parenthesis">(</span><span class="string_literal">"Hello, {}!"</span><span class="comma">,</span> <span class="numeric_literal">92</span><span class="parenthesis">)</span><span class="semicolon">;</span>
86+
<span class="macro">dont_color_me_braces</span><span class="macro_bang">!</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
87+
<span class="macro">noop</span><span class="macro_bang">!</span><span class="parenthesis">(</span><span class="macro">noop</span><span class="macro_bang">!</span><span class="parenthesis">(</span><span class="numeric_literal">1</span><span class="parenthesis">)</span><span class="parenthesis">)</span><span class="semicolon">;</span>
88+
<span class="brace">}</span></code></pre>

‎crates/ide/src/syntax_highlighting/test_data/rainbow_highlighting.html renamed to ‎crates/ide/src/syntax_highlighting/test_data/highlight_rainbow.html

File renamed without changes.

‎crates/ide/src/syntax_highlighting/test_data/injection.html

-52
This file was deleted.

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

+19-28
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn attributes() {
2727
// The reason for these being here is to test AttrIds
2828
struct Foo;
2929
"#,
30-
expect_file!["./test_data/attributes.html"],
30+
expect_file!["./test_data/highlight_attributes.html"],
3131
false,
3232
);
3333
}
@@ -82,11 +82,13 @@ fn main() {
8282
noop!(noop!(1));
8383
}
8484
"#,
85-
expect_file!["./test_data/macros.html"],
85+
expect_file!["./test_data/highlight_macros.html"],
8686
false,
8787
);
8888
}
8989

90+
/// If what you want to test feels like a specific entity consider making a new test instead,
91+
/// this test fixture here in fact should shrink instead of grow ideally.
9092
#[test]
9193
fn test_highlighting() {
9294
check_highlighting(
@@ -305,7 +307,7 @@ macro_rules! die {
305307
};
306308
}
307309
"#,
308-
expect_file!["./test_data/highlighting.html"],
310+
expect_file!["./test_data/highlight_general.html"],
309311
false,
310312
);
311313
}
@@ -762,17 +764,26 @@ impl t for foo {
762764
fn test_injection() {
763765
check_highlighting(
764766
r##"
765-
fn f(ra_fixture: &str) {}
767+
fn fixture(ra_fixture: &str) {}
768+
766769
fn main() {
767-
f(r"
770+
fixture(r#"
771+
trait Foo {
772+
fn foo() {
773+
println!("2 + 2 = {}", 4);
774+
}
775+
}"#
776+
);
777+
fixture(r"
768778
fn foo() {
769779
foo(\$0{
770780
92
771781
}\$0)
772-
}");
782+
}"
783+
);
773784
}
774785
"##,
775-
expect_file!["./test_data/injection.html"],
786+
expect_file!["./test_data/highlight_injection.html"],
776787
false,
777788
);
778789
}
@@ -794,7 +805,7 @@ fn bar() {
794805
let mut hello = "hello";
795806
}
796807
"#,
797-
expect_file!["./test_data/rainbow_highlighting.html"],
808+
expect_file!["./test_data/highlight_rainbow.html"],
798809
true,
799810
);
800811
}
@@ -819,26 +830,6 @@ struct Foo {
819830
assert_eq!(&highlights[0].highlight.to_string(), "field.declaration.public");
820831
}
821832

822-
#[test]
823-
fn test_flattening() {
824-
check_highlighting(
825-
r##"
826-
fn fixture(ra_fixture: &str) {}
827-
828-
fn main() {
829-
fixture(r#"
830-
trait Foo {
831-
fn foo() {
832-
println!("2 + 2 = {}", 4);
833-
}
834-
}"#
835-
);
836-
}"##,
837-
expect_file!["./test_data/highlight_injection.html"],
838-
false,
839-
);
840-
}
841-
842833
#[test]
843834
fn ranges_sorted() {
844835
let (analysis, file_id) = fixture::file(

0 commit comments

Comments
 (0)