Skip to content

Commit 20e1268

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of #102914 - GuillaumeGomez:migrate-css-highlight-without-change, r=notriddle
Migrate css highlight without change This is a "previous" version of #102663: only migrating to CSS variables, no changes. It's a bit more verbose because rules are not coherent between themes. r? ``@notriddle``
2 parents b4906ac + bca1005 commit 20e1268

File tree

6 files changed

+162
-55
lines changed

6 files changed

+162
-55
lines changed

‎src/librustdoc/html/static/css/rustdoc.css

+47-5
Original file line numberDiff line numberDiff line change
@@ -1089,8 +1089,55 @@ so that we can apply CSS-filters to change the arrow color in themes */
10891089
color: var(--right-side-color);
10901090
}
10911091

1092+
pre.rust {
1093+
tab-size: 4;
1094+
-moz-tab-size: 4;
1095+
}
1096+
1097+
/* Code highlighting */
1098+
pre.rust .kw {
1099+
color: var(--code-highlight-kw-color);
1100+
}
1101+
pre.rust .kw-2 {
1102+
color: var(--code-highlight-kw-2-color);
1103+
}
1104+
pre.rust .lifetime {
1105+
color: var(--code-highlight-lifetime-color);
1106+
}
1107+
pre.rust .prelude-ty {
1108+
color: var(--code-highlight-prelude-color);
1109+
}
1110+
pre.rust .prelude-val {
1111+
color: var(--code-highlight-prelude-val-color);
1112+
}
1113+
pre.rust .string {
1114+
color: var(--code-highlight-string-color);
1115+
}
1116+
pre.rust .number {
1117+
color: var(--code-highlight-number-color);
1118+
}
1119+
pre.rust .bool-val {
1120+
color: var(--code-highlight-literal-color);
1121+
}
1122+
pre.rust .self {
1123+
color: var(--code-highlight-self-color);
1124+
}
1125+
pre.rust .attribute {
1126+
color: var(--code-highlight-attribute-color);
1127+
}
1128+
pre.rust .macro,
1129+
pre.rust .macro-nonterminal {
1130+
color: var(--code-highlight-macro-color);
1131+
}
10921132
pre.rust .question-mark {
10931133
font-weight: bold;
1134+
color: var(--code-highlight-question-mark-color);
1135+
}
1136+
pre.rust .comment {
1137+
color: var(--code-highlight-comment-color);
1138+
}
1139+
pre.rust .doccomment {
1140+
color: var(--code-highlight-doc-comment-color);
10941141
}
10951142

10961143
.example-wrap.compile_fail,
@@ -1296,11 +1343,6 @@ h3.variant {
12961343
font-size: 1.25rem;
12971344
}
12981345

1299-
pre.rust {
1300-
tab-size: 4;
1301-
-moz-tab-size: 4;
1302-
}
1303-
13041346
.search-failed {
13051347
text-align: center;
13061348
margin-top: 20px;

‎src/librustdoc/html/static/css/themes/ayu.css

+14-20
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,20 @@ Original by Dempfi (https://github.com/dempfi/ayu)
4141
--stab-background-color: #314559;
4242
--stab-code-color: #e6e1cf;
4343
--search-color: #fff;
44+
--code-highlight-kw-color: #ff7733;
45+
--code-highlight-kw-2-color: #ff7733;
46+
--code-highlight-lifetime-color: #ff7733;
47+
--code-highlight-prelude-color: #69f2df;
48+
--code-highlight-prelude-val-color: #ff7733;
49+
--code-highlight-number-color: #b8cc52;
50+
--code-highlight-string-color: #b8cc52;
51+
--code-highlight-literal-color: #ff7733;
52+
--code-highlight-attribute-color: #e6e1cf;
53+
--code-highlight-self-color: #36a3d9;
54+
--code-highlight-macro-color: #a37acc;
55+
--code-highlight-question-mark-color: #ff9011;
56+
--code-highlight-comment-color: #788797;
57+
--code-highlight-doc-comment-color: #a1ac88;
4458
}
4559

4660
.slider {
@@ -124,9 +138,6 @@ pre, .rustdoc.source .example-wrap {
124138

125139
.content .item-info::before { color: #ccc; }
126140

127-
pre.rust .comment { color: #788797; }
128-
pre.rust .doccomment { color: #a1ac88; }
129-
130141
.sidebar h2 a,
131142
.sidebar h3 a {
132143
color: white;
@@ -161,23 +172,6 @@ details.rustdoc-toggle > summary::before {
161172

162173
.src-line-numbers :target { background-color: transparent; }
163174

164-
/* Code highlighting */
165-
pre.rust .number, pre.rust .string { color: #b8cc52; }
166-
pre.rust .kw, pre.rust .kw-2, pre.rust .prelude-ty,
167-
pre.rust .bool-val, pre.rust .prelude-val,
168-
pre.rust .lifetime { color: #ff7733; }
169-
pre.rust .macro, pre.rust .macro-nonterminal { color: #a37acc; }
170-
pre.rust .question-mark {
171-
color: #ff9011;
172-
}
173-
pre.rust .self {
174-
color: #36a3d9;
175-
font-style: italic;
176-
}
177-
pre.rust .attribute {
178-
color: #e6e1cf;
179-
}
180-
181175
pre.example-line-numbers {
182176
color: #5c67736e;
183177
border: none;

‎src/librustdoc/html/static/css/themes/dark.css

+14-15
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
--stab-background-color: #314559;
3737
--stab-code-color: #e6e1cf;
3838
--search-color: #111;
39+
--code-highlight-kw-color: #ab8ac1;
40+
--code-highlight-kw-2-color: #769acb;
41+
--code-highlight-lifetime-color: #d97f26;
42+
--code-highlight-prelude-color: #769acb;
43+
--code-highlight-prelude-val-color: #ee6868;
44+
--code-highlight-number-color: #83a300;
45+
--code-highlight-string-color: #83a300;
46+
--code-highlight-literal-color: #ee6868;
47+
--code-highlight-attribute-color: #ee6868;
48+
--code-highlight-self-color: #ee6868;
49+
--code-highlight-macro-color: #3e999f;
50+
--code-highlight-question-mark-color: #ff9011;
51+
--code-highlight-comment-color: #8d8d8b;
52+
--code-highlight-doc-comment-color: #8ca375;
3953
}
4054

4155
.slider {
@@ -62,9 +76,6 @@ input:focus + .slider {
6276

6377
.content .item-info::before { color: #ccc; }
6478

65-
pre.rust .comment { color: #8d8d8b; }
66-
pre.rust .doccomment { color: #8ca375; }
67-
6879
body.source .example-wrap pre.rust a {
6980
background: #333;
7081
}
@@ -86,18 +97,6 @@ details.rustdoc-toggle > summary::before {
8697

8798
.src-line-numbers :target { background-color: transparent; }
8899

89-
/* Code highlighting */
90-
pre.rust .kw { color: #ab8ac1; }
91-
pre.rust .kw-2, pre.rust .prelude-ty { color: #769acb; }
92-
pre.rust .number, pre.rust .string { color: #83a300; }
93-
pre.rust .self, pre.rust .bool-val, pre.rust .prelude-val,
94-
pre.rust .attribute { color: #ee6868; }
95-
pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; }
96-
pre.rust .lifetime { color: #d97f26; }
97-
pre.rust .question-mark {
98-
color: #ff9011;
99-
}
100-
101100
pre.example-line-numbers {
102101
border-color: #4a4949;
103102
}

‎src/librustdoc/html/static/css/themes/light.css

+14-14
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
--stab-background-color: #fff5d6;
3737
--stab-code-color: #000;
3838
--search-color: #000;
39+
--code-highlight-kw-color: #8959a8;
40+
--code-highlight-kw-2-color: #4271ae;
41+
--code-highlight-lifetime-color: #b76514;
42+
--code-highlight-prelude-color: #4271ae;
43+
--code-highlight-prelude-val-color: #c82829;
44+
--code-highlight-number-color: #718c00;
45+
--code-highlight-string-color: #718c00;
46+
--code-highlight-literal-color: #c82829;
47+
--code-highlight-attribute-color: #c82829;
48+
--code-highlight-self-color: #c82829;
49+
--code-highlight-macro-color: #3e999f;
50+
--code-highlight-question-mark-color: #ff9011;
51+
--code-highlight-comment-color: #8e908c;
52+
--code-highlight-doc-comment-color: #4d4d4c;
3953
}
4054

4155
.slider {
@@ -78,20 +92,6 @@ body.source .example-wrap pre.rust a {
7892

7993
.src-line-numbers :target { background-color: transparent; }
8094

81-
/* Code highlighting */
82-
pre.rust .kw { color: #8959A8; }
83-
pre.rust .kw-2, pre.rust .prelude-ty { color: #4271AE; }
84-
pre.rust .number, pre.rust .string { color: #718C00; }
85-
pre.rust .self, pre.rust .bool-val, pre.rust .prelude-val,
86-
pre.rust .attribute { color: #C82829; }
87-
pre.rust .comment { color: #8E908C; }
88-
pre.rust .doccomment { color: #4D4D4C; }
89-
pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; }
90-
pre.rust .lifetime { color: #B76514; }
91-
pre.rust .question-mark {
92-
color: #ff9011;
93-
}
94-
9595
pre.example-line-numbers {
9696
border-color: #c7c7c7;
9797
}

‎src/test/rustdoc-gui/highlight-colors.goml

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
// This test checks the highlight colors in the source code pages.
2+
goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
3+
show-text: true
4+
5+
local-storage: {"rustdoc-theme": "ayu", "rustdoc-use-system-theme": "false"}
6+
reload:
7+
8+
assert-css: ("pre.rust .kw", {"color": "rgb(255, 119, 51)"}, ALL)
9+
assert-css: ("pre.rust .kw-2", {"color": "rgb(255, 119, 51)"}, ALL)
10+
assert-css: ("pre.rust .prelude-ty", {"color": "rgb(105, 242, 223)"}, ALL)
11+
assert-css: ("pre.rust .prelude-val", {"color": "rgb(255, 119, 51)"}, ALL)
12+
assert-css: ("pre.rust .lifetime", {"color": "rgb(255, 119, 51)"}, ALL)
13+
assert-css: ("pre.rust .number", {"color": "rgb(184, 204, 82)"}, ALL)
14+
assert-css: ("pre.rust .string", {"color": "rgb(184, 204, 82)"}, ALL)
15+
assert-css: ("pre.rust .bool-val", {"color": "rgb(255, 119, 51)"}, ALL)
16+
assert-css: ("pre.rust .self", {"color": "rgb(54, 163, 217)"}, ALL)
17+
assert-css: ("pre.rust .attribute", {"color": "rgb(230, 225, 207)"}, ALL)
18+
assert-css: ("pre.rust .macro", {"color": "rgb(163, 122, 204)"}, ALL)
19+
assert-css: ("pre.rust .question-mark", {"color": "rgb(255, 144, 17)"}, ALL)
20+
assert-css: ("pre.rust .comment", {"color": "rgb(120, 135, 151)"}, ALL)
21+
assert-css: ("pre.rust .doccomment", {"color": "rgb(161, 172, 136)"}, ALL)
22+
23+
local-storage: {"rustdoc-theme": "dark"}
24+
reload:
25+
26+
assert-css: ("pre.rust .kw", {"color": "rgb(171, 138, 193)"}, ALL)
27+
assert-css: ("pre.rust .kw-2", {"color": "rgb(118, 154, 203)"}, ALL)
28+
assert-css: ("pre.rust .prelude-ty", {"color": "rgb(118, 154, 203)"}, ALL)
29+
assert-css: ("pre.rust .prelude-val", {"color": "rgb(238, 104, 104)"}, ALL)
30+
assert-css: ("pre.rust .lifetime", {"color": "rgb(217, 127, 38)"}, ALL)
31+
assert-css: ("pre.rust .number", {"color": "rgb(131, 163, 0)"}, ALL)
32+
assert-css: ("pre.rust .string", {"color": "rgb(131, 163, 0)"}, ALL)
33+
assert-css: ("pre.rust .bool-val", {"color": "rgb(238, 104, 104)"}, ALL)
34+
assert-css: ("pre.rust .self", {"color": "rgb(238, 104, 104)"}, ALL)
35+
assert-css: ("pre.rust .attribute", {"color": "rgb(238, 104, 104)"}, ALL)
36+
assert-css: ("pre.rust .macro", {"color": "rgb(62, 153, 159)"}, ALL)
37+
assert-css: ("pre.rust .question-mark", {"color": "rgb(255, 144, 17)"}, ALL)
38+
assert-css: ("pre.rust .comment", {"color": "rgb(141, 141, 139)"}, ALL)
39+
assert-css: ("pre.rust .doccomment", {"color": "rgb(140, 163, 117)"}, ALL)
40+
41+
local-storage: {"rustdoc-theme": "light"}
42+
reload:
43+
44+
assert-css: ("pre.rust .kw", {"color": "rgb(137, 89, 168)"}, ALL)
45+
assert-css: ("pre.rust .kw-2", {"color": "rgb(66, 113, 174)"}, ALL)
46+
assert-css: ("pre.rust .prelude-ty", {"color": "rgb(66, 113, 174)"}, ALL)
47+
assert-css: ("pre.rust .prelude-val", {"color": "rgb(200, 40, 41)"}, ALL)
48+
assert-css: ("pre.rust .lifetime", {"color": "rgb(183, 101, 20)"}, ALL)
49+
assert-css: ("pre.rust .number", {"color": "rgb(113, 140, 0)"}, ALL)
50+
assert-css: ("pre.rust .string", {"color": "rgb(113, 140, 0)"}, ALL)
51+
assert-css: ("pre.rust .bool-val", {"color": "rgb(200, 40, 41)"}, ALL)
52+
assert-css: ("pre.rust .self", {"color": "rgb(200, 40, 41)"}, ALL)
53+
assert-css: ("pre.rust .attribute", {"color": "rgb(200, 40, 41)"}, ALL)
54+
assert-css: ("pre.rust .macro", {"color": "rgb(62, 153, 159)"}, ALL)
55+
assert-css: ("pre.rust .question-mark", {"color": "rgb(255, 144, 17)"}, ALL)
56+
assert-css: ("pre.rust .comment", {"color": "rgb(142, 144, 140)"}, ALL)
57+
assert-css: ("pre.rust .doccomment", {"color": "rgb(77, 77, 76)"}, ALL)

‎src/test/rustdoc-gui/src/test_docs/lib.rs

+16-1
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,24 @@ pub trait TraitWithNoDocblocks {
363363

364364
pub struct TypeWithNoDocblocks;
365365

366+
impl TypeWithNoDocblocks {
367+
fn x() -> Option<Self> {
368+
Some(Self)
369+
}
370+
fn y() -> Option<u32> {
371+
// code comment
372+
let t = Self::x()?;
373+
Some(0)
374+
}
375+
}
376+
366377
impl TypeWithNoDocblocks {
367378
pub fn first_fn(&self) {}
368-
pub fn second_fn(&self) {}
379+
pub fn second_fn<'a>(&'a self) {
380+
let x = 12;
381+
let y = "a";
382+
let z = false;
383+
}
369384
}
370385

371386
pub unsafe fn unsafe_fn() {}

0 commit comments

Comments
 (0)