github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

markup/highlight: Fix chroma highlight

Browse source 
* Use chroma.Coalesce
* Escape code strings if lexer is nil

Fixes #6877
Fixes #6856
This commit is contained in:
satotake 2020-02-17 22:59:26 +09:00 committed by GitHub
parent 54bdcaacae
commit 3c568ad013
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
markup/highlight/highlight.go
View file

@ -15,6 +15,7 @@ package highlight
import ( import (
"fmt" "fmt"
gohtml "html"
"io" "io"
"strings" "strings"
@ -63,7 +64,7 @@ func highlight(code, lang string, cfg Config) (string, error) {
if lexer == nil { if lexer == nil {
wrapper := getPreWrapper(lang) wrapper := getPreWrapper(lang)
fmt.Fprint(w, wrapper.Start(true, "")) fmt.Fprint(w, wrapper.Start(true, ""))
fmt.Fprint(w, code) fmt.Fprint(w, gohtml.EscapeString(code))
fmt.Fprint(w, wrapper.End(true)) fmt.Fprint(w, wrapper.End(true))
return w.String(), nil return w.String(), nil
} }
@ -72,6 +73,7 @@ func highlight(code, lang string, cfg Config) (string, error) {
if style == nil { if style == nil {
style = styles.Fallback style = styles.Fallback
} }
lexer = chroma.Coalesce(lexer)
iterator, err := lexer.Tokenise(nil, code) iterator, err := lexer.Tokenise(nil, code)
if err != nil { if err != nil {

29
markup/highlight/highlight_test.go
View file

@ -29,6 +29,13 @@ LINE3
LINE4 LINE4
LINE5 LINE5
` `
coalesceNeeded := `GET /foo HTTP/1.1
Content-Type: application/json
User-Agent: foo
{
"hello": "world"
}`
c.Run("Basic", func(c *qt.C) { c.Run("Basic", func(c *qt.C) {
cfg := DefaultConfig cfg := DefaultConfig
@ -38,7 +45,7 @@ LINE5
result, _ := h.Highlight(`echo "Hugo Rocks!"`, "bash", "") result, _ := h.Highlight(`echo "Hugo Rocks!"`, "bash", "")
c.Assert(result, qt.Equals, `<div class="highlight"><pre class="chroma"><code class="language-bash" data-lang="bash"><span class="nb">echo</span> <span class="s2">&#34;Hugo Rocks!&#34;</span></code></pre></div>`) c.Assert(result, qt.Equals, `<div class="highlight"><pre class="chroma"><code class="language-bash" data-lang="bash"><span class="nb">echo</span> <span class="s2">&#34;Hugo Rocks!&#34;</span></code></pre></div>`)
result, _ = h.Highlight(`echo "Hugo Rocks!"`, "unknown", "") result, _ = h.Highlight(`echo "Hugo Rocks!"`, "unknown", "")
c.Assert(result, qt.Equals, `<pre><code class="language-unknown" data-lang="unknown">echo "Hugo Rocks!"</code></pre>`) c.Assert(result, qt.Equals, `<pre><code class="language-unknown" data-lang="unknown">echo &#34;Hugo Rocks!&#34;</code></pre>`)
}) })
@ -106,4 +113,24 @@ LINE5
result, _ := h.Highlight(lines, "", "") result, _ := h.Highlight(lines, "", "")
c.Assert(result, qt.Contains, "<span class=\"ln\">2</span>LINE2\n<") c.Assert(result, qt.Contains, "<span class=\"ln\">2</span>LINE2\n<")
}) })
c.Run("No language, Escape HTML string", func(c *qt.C) {
cfg := DefaultConfig
cfg.NoClasses = false
h := New(cfg)
result, _ := h.Highlight("Escaping less-than in code block? <fail>", "", "")
c.Assert(result, qt.Contains, "&lt;fail&gt;")
})
c.Run("Highlight lines, default config", func(c *qt.C) {
cfg := DefaultConfig
cfg.NoClasses = false
h := New(cfg)
result, _ := h.Highlight(coalesceNeeded, "http", "linenos=true,hl_lines=2")
c.Assert(result, qt.Contains, "hello")
c.Assert(result, qt.Contains, "}")
})
} }