Skip to content

Commit 7f42edc

Browse files
starpitstarpit
committed
feat: syntax highlight code in markdown blocks
Signed-off-by: Nick Mitchell <[email protected]>
1 parent 3e407cf commit 7f42edc

File tree

4 files changed

+254
-7
lines changed

4 files changed

+254
-7
lines changed

‎pdl-live-react/package-lock.json‎

Lines changed: 89 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pdl-live-react/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@
3131
"@tauri-apps/plugin-fs": "^2.2.0",
3232
"@tauri-apps/plugin-opener": "^2",
3333
"@tauri-apps/plugin-window-state": "^2.2.1",
34+
"@wooorm/starry-night": "^3.6.0",
3435
"pretty-bytes": "^6.1.1",
3536
"pretty-ms": "^9.2.0",
3637
"react": "^18.3.1",
3738
"react-dom": "^18.3.1",
38-
"react-markdown": "^9.0.3",
39+
"react-markdown": "^10.0.0",
3940
"react-router": "^7.1.5",
4041
"react-syntax-highlighter": "^15.6.1",
42+
"rehype-starry-night": "^2.2.0",
4143
"ts-pattern": "^5.6.2",
4244
"yaml": "^2.7.0"
4345
},

‎pdl-live-react/src/view/Markdown.css‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,159 @@
22
padding: 1em;
33
background-color: var(--pf-t--global--background--color--primary--default);
44
}
5+
6+
/* This is a theme distributed by `starry-night`.
7+
* It’s based on what GitHub uses on their site.
8+
* See <https://github.com/wooorm/starry-night> for more info. */
9+
.pdl-markdown {
10+
--color-prettylights-syntax-comment: #59636e;
11+
--color-prettylights-syntax-constant: #0550ae;
12+
--color-prettylights-syntax-constant-other-reference-link: #0a3069;
13+
--color-prettylights-syntax-entity: #6639ba;
14+
--color-prettylights-syntax-storage-modifier-import: #1f2328;
15+
--color-prettylights-syntax-entity-tag: #0550ae;
16+
--color-prettylights-syntax-keyword: #cf222e;
17+
--color-prettylights-syntax-string: #0a3069;
18+
--color-prettylights-syntax-variable: #953800;
19+
--color-prettylights-syntax-brackethighlighter-unmatched: #82071e;
20+
--color-prettylights-syntax-brackethighlighter-angle: #59636e;
21+
--color-prettylights-syntax-invalid-illegal-text: #f6f8fa;
22+
--color-prettylights-syntax-invalid-illegal-bg: #82071e;
23+
--color-prettylights-syntax-carriage-return-text: #f6f8fa;
24+
--color-prettylights-syntax-carriage-return-bg: #cf222e;
25+
--color-prettylights-syntax-string-regexp: #116329;
26+
--color-prettylights-syntax-markup-list: #3b2300;
27+
--color-prettylights-syntax-markup-heading: #0550ae;
28+
--color-prettylights-syntax-markup-italic: #1f2328;
29+
--color-prettylights-syntax-markup-bold: #1f2328;
30+
--color-prettylights-syntax-markup-deleted-text: #82071e;
31+
--color-prettylights-syntax-markup-deleted-bg: #ffebe9;
32+
--color-prettylights-syntax-markup-inserted-text: #116329;
33+
--color-prettylights-syntax-markup-inserted-bg: #dafbe1;
34+
--color-prettylights-syntax-markup-changed-text: #953800;
35+
--color-prettylights-syntax-markup-changed-bg: #ffd8b5;
36+
--color-prettylights-syntax-markup-ignored-text: #d1d9e0;
37+
--color-prettylights-syntax-markup-ignored-bg: #0550ae;
38+
--color-prettylights-syntax-meta-diff-range: #8250df;
39+
--color-prettylights-syntax-sublimelinter-gutter-mark: #818b98;
40+
}
41+
42+
.pl-c {
43+
color: var(--color-prettylights-syntax-comment);
44+
}
45+
46+
.pl-c1,
47+
.pl-s .pl-v {
48+
color: var(--color-prettylights-syntax-constant);
49+
}
50+
51+
.pl-e,
52+
.pl-en {
53+
color: var(--color-prettylights-syntax-entity);
54+
}
55+
56+
.pl-smi,
57+
.pl-s .pl-s1 {
58+
color: var(--color-prettylights-syntax-storage-modifier-import);
59+
}
60+
61+
.pl-ent {
62+
color: var(--color-prettylights-syntax-entity-tag);
63+
}
64+
65+
.pl-k {
66+
color: var(--color-prettylights-syntax-keyword);
67+
}
68+
69+
.pl-s,
70+
.pl-pds,
71+
.pl-s .pl-pse .pl-s1,
72+
.pl-sr,
73+
.pl-sr .pl-cce,
74+
.pl-sr .pl-sre,
75+
.pl-sr .pl-sra {
76+
color: var(--color-prettylights-syntax-string);
77+
}
78+
79+
.pl-v,
80+
.pl-smw {
81+
color: var(--color-prettylights-syntax-variable);
82+
}
83+
84+
.pl-bu {
85+
color: var(--color-prettylights-syntax-brackethighlighter-unmatched);
86+
}
87+
88+
.pl-ii {
89+
color: var(--color-prettylights-syntax-invalid-illegal-text);
90+
background-color: var(--color-prettylights-syntax-invalid-illegal-bg);
91+
}
92+
93+
.pl-c2 {
94+
color: var(--color-prettylights-syntax-carriage-return-text);
95+
background-color: var(--color-prettylights-syntax-carriage-return-bg);
96+
}
97+
98+
.pl-sr .pl-cce {
99+
font-weight: bold;
100+
color: var(--color-prettylights-syntax-string-regexp);
101+
}
102+
103+
.pl-ml {
104+
color: var(--color-prettylights-syntax-markup-list);
105+
}
106+
107+
.pl-mh,
108+
.pl-mh .pl-en,
109+
.pl-ms {
110+
font-weight: bold;
111+
color: var(--color-prettylights-syntax-markup-heading);
112+
}
113+
114+
.pl-mi {
115+
font-style: italic;
116+
color: var(--color-prettylights-syntax-markup-italic);
117+
}
118+
119+
.pl-mb {
120+
font-weight: bold;
121+
color: var(--color-prettylights-syntax-markup-bold);
122+
}
123+
124+
.pl-md {
125+
color: var(--color-prettylights-syntax-markup-deleted-text);
126+
background-color: var(--color-prettylights-syntax-markup-deleted-bg);
127+
}
128+
129+
.pl-mi1 {
130+
color: var(--color-prettylights-syntax-markup-inserted-text);
131+
background-color: var(--color-prettylights-syntax-markup-inserted-bg);
132+
}
133+
134+
.pl-mc {
135+
color: var(--color-prettylights-syntax-markup-changed-text);
136+
background-color: var(--color-prettylights-syntax-markup-changed-bg);
137+
}
138+
139+
.pl-mi2 {
140+
color: var(--color-prettylights-syntax-markup-ignored-text);
141+
background-color: var(--color-prettylights-syntax-markup-ignored-bg);
142+
}
143+
144+
.pl-mdr {
145+
font-weight: bold;
146+
color: var(--color-prettylights-syntax-meta-diff-range);
147+
}
148+
149+
.pl-ba {
150+
color: var(--color-prettylights-syntax-brackethighlighter-angle);
151+
}
152+
153+
.pl-sg {
154+
color: var(--color-prettylights-syntax-sublimelinter-gutter-mark);
155+
}
156+
157+
.pl-corl {
158+
text-decoration: underline;
159+
color: var(--color-prettylights-syntax-constant-other-reference-link);
160+
}

‎pdl-live-react/src/view/Markdown.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
import { Content } from "@patternfly/react-core"
2-
import RMD, { type Options as MarkdownProps } from "react-markdown"
2+
import rehypeStarryNight from "rehype-starry-night"
3+
import {
4+
MarkdownHooks as RMD,
5+
type Options as MarkdownProps,
6+
} from "react-markdown"
37

48
import "./Markdown.css"
59

610
/** Simple wrapper over <Markdown/> */
711
export default function Markdown(props: MarkdownProps) {
812
return (
913
<Content className="pdl-markdown">
10-
<RMD {...props} />
14+
<RMD {...props} rehypePlugins={[rehypeStarryNight]} />
1115
</Content>
1216
)
1317
}

0 commit comments

Comments
 (0)