Skip to content

Commit 39ac24f

Browse files
lukewhritlukewhrit
committed
feat(server/web): move syntax highlighting backend with Chroma
close #428
1 parent d8701e6 commit 39ac24f

File tree

12 files changed

+122
-1258
lines changed

12 files changed

+122
-1258
lines changed

‎go.mod

+4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ require (
1515
golang.org/x/exp v0.0.0-20230807204917-050eac23e9de
1616
)
1717

18+
require github.com/dlclark/regexp2 v1.11.0 // indirect
19+
1820
require (
21+
github.com/alecthomas/chroma v0.10.0
22+
github.com/alecthomas/chroma/v2 v2.14.0
1923
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2024
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2125
github.com/davecgh/go-spew v1.1.1 // indirect

‎go.sum

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
2+
github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
3+
github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E=
4+
github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I=
15
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
26
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
37
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
@@ -10,6 +14,9 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
1014
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1115
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1216
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
17+
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
18+
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
19+
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
1320
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
1421
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
1522
github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
@@ -46,6 +53,7 @@ github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
4653
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
4754
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
4855
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
56+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
4957
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
5058
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
5159
golang.org/x/exp v0.0.0-20230807204917-050eac23e9de h1:l5Za6utMv/HsBWWqzt4S8X17j+kt1uVETUX5UFhn2rE=
@@ -60,5 +68,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
6068
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
6169
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
6270
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
71+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
6372
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
6473
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎internal/server/fetch.go

+12-4
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,19 @@ func (s *Server) StaticDocument(w http.ResponseWriter, r *http.Request) {
7878
extension = params[1]
7979
}
8080

81+
highlighted, css, err := util.Highlight(document.Content, extension)
82+
83+
if err != nil {
84+
util.WriteError(w, http.StatusInternalServerError, err)
85+
return
86+
}
87+
8188
data := map[string]interface{}{
82-
"Lines": util.CountLines(document.Content),
83-
"Content": document.Content,
84-
"Extension": extension,
85-
"Analytics": template.HTML(config.Config.Analytics),
89+
"Stylesheet": template.CSS(css),
90+
"Content": document.Content,
91+
"Highlighted": template.HTML(highlighted),
92+
"Extension": extension,
93+
"Analytics": template.HTML(config.Config.Analytics),
8694
}
8795

8896
if err := t.Execute(w, data); err != nil {

‎internal/server/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (s *Server) RegisterHeaders() {
124124
s.Router.Use(middleware.SetHeader("X-Content-Type-Options", "nosniff"))
125125
s.Router.Use(middleware.SetHeader("Referrer-Policy", "no-referrer-when-downgrade"))
126126
s.Router.Use(middleware.SetHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload"))
127-
s.Router.Use(middleware.SetHeader("Content-Security-Policy", "default-src 'self'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; script-src 'self' 'unsafe-inline';"))
127+
s.Router.Use(middleware.SetHeader("Content-Security-Policy", "default-src 'self'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline';"))
128128
}
129129

130130
func (s *Server) MountStatic() {

‎internal/server/web/document.html

+10-12
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@
1717
content="Spacebin is a highly-reliable pastebin server, built with Go, that's capable of serving notes, code, or any other documents." />
1818
<meta property="og:color" content="#e34b4a" />
1919

20+
<style>{{.Stylesheet}}</style>
21+
22+
2023
<link rel="icon" type="image/x-icon" href="/static/favicon.ico">
2124
<link rel="stylesheet" type="text/css" href="/static/normalize.css">
22-
<link rel="stylesheet" type="text/css" href="/static/monokai.min.css">
2325
<link rel="stylesheet" type="text/css" href="/static/global.css">
2426

2527
{{.Analytics}}
28+
2629
</head>
2730

2831
<body>
@@ -63,24 +66,19 @@
6366

6467
<p id="donate-long">
6568
Keep Spacebin free of ads by
66-
<a id="donate-link" href="https://github.com/sponsors/lukewhrit" aria-label="Donate to Spacebin" target="_blank">donating.</a>
69+
<a id="donate-link" href="https://github.com/sponsors/lukewhrit" aria-label="Donate to Spacebin"
70+
target="_blank">donating.</a>
6771
💕
6872
</p>
6973
<p id="donate-short">
70-
<a id="short-donate-link" href="https://github.com/sponsors/lukewhrit" aria-label="Donate to Spacebin" target="_blank">Donate 💕</a>
74+
<a id="short-donate-link" href="https://github.com/sponsors/lukewhrit" aria-label="Donate to Spacebin"
75+
target="_blank">Donate 💕</a>
7176
</p>
7277
</header>
7378

7479
<main>
75-
<div id="line-numbers">
76-
{{.Lines}}
77-
</div>
78-
<pre><code class="language-{{.Extension}}">{{.Content}}</code></pre>
80+
<pre><code>{{.Highlighted}}</code></pre>
7981
</main>
80-
81-
<script src="/static/highlight.min.js"></script>
82-
<script>hljs.highlightAll();</script>
83-
8482
</body>
8583

86-
</html>
84+
</html>

‎internal/server/web/index.html

+8-5
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
</svg>
4646
</a>
4747

48-
<a id="wiki" href="https://github.com/lukewhrit/spacebin/blob/main/README.md/#-spacebin" aria-label="Spacebin Documentation" target="_blank">
48+
<a id="wiki" href="https://github.com/lukewhrit/spacebin/blob/main/README.md/#-spacebin"
49+
aria-label="Spacebin Documentation" target="_blank">
4950
<svg fill="none" height="24" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
5051
stroke-width="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
5152
<path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z" />
@@ -55,16 +56,18 @@
5556

5657
<p id="donate-long">
5758
Keep Spacebin free of ads by
58-
<a id="donate-link" href="https://github.com/sponsors/lukewhrit" aria-label="Donate to Spacebin" target="_blank">donating.</a>
59+
<a id="donate-link" href="https://github.com/sponsors/lukewhrit" aria-label="Donate to Spacebin"
60+
target="_blank">donating.</a>
5961
💕
6062
</p>
6163
<p id="donate-short">
62-
<a id="short-donate-link" href="https://github.com/sponsors/lukewhrit" aria-label="Donate to Spacebin" target="_blank">Donate 💕</a>
64+
<a id="short-donate-link" href="https://github.com/sponsors/lukewhrit" aria-label="Donate to Spacebin"
65+
target="_blank">Donate 💕</a>
6366
</p>
6467
</header>
6568

66-
<main>
67-
<div id="line-numbers">
69+
<main id="with-prompt">
70+
<div id="prompt">
6871
<div>&gt;</div>
6972
</div>
7073

‎internal/server/web/static/global.css

+19-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--font-size: 17px;
55
--line-height: 1.3;
66

7-
--color-line-numbers: #454545;
7+
--color-prompt: #7f7f7f;
88
--color-links: #91aadf;
99
--color-links-dark: #7a98d8;
1010
--color-foreground: #dedede;
@@ -25,11 +25,14 @@ body {
2525
}
2626

2727
main {
28-
padding: 20px 50px;
29-
padding-top: 0;
28+
padding-top: 0 !important;
3029
margin: 0;
3130
}
3231

32+
main#with-prompt {
33+
padding: 20px 50px;
34+
}
35+
3336
textarea {
3437
background: transparent;
3538
border: none;
@@ -44,7 +47,8 @@ textarea {
4447
display: inline;
4548
}
4649

47-
textarea:hover, textarea:focus {
50+
textarea:hover,
51+
textarea:focus {
4852
outline: none;
4953
border: none;
5054
}
@@ -58,8 +62,8 @@ header {
5862
gap: 10px;
5963
}
6064

61-
#line-numbers {
62-
color: var(--color-line-numbers);
65+
#prompt {
66+
color: var(--color-prompt);
6367
z-index: -1000;
6468
user-select: none;
6569
position: absolute;
@@ -120,14 +124,16 @@ h1 {
120124
}
121125

122126
#warning {
123-
color: #F97583;
127+
color: #f97583;
124128
}
125129

126-
#donate-long, #donate-short {
130+
#donate-long,
131+
#donate-short {
127132
margin: 0 0 0 auto;
128133
}
129134

130-
#donate-link:hover, #short-donate-link:hover {
135+
#donate-link:hover,
136+
#short-donate-link:hover {
131137
text-decoration: underline;
132138
}
133139

@@ -144,3 +150,7 @@ h1 {
144150
display: block;
145151
}
146152
}
153+
154+
.chroma {
155+
background-color: transparent !important;
156+
}

0 commit comments

Comments
 (0)