Updated Chroma to v0.10.0 (#18270)

diff --git a/go.mod b/go.mod
index ce3be970bdfd130de7e61241d6117bdfb1147040..abb6a93fb7e3613daac40993c54757f79b78c505 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
        github.com/NYTimes/gziphandler v1.1.1
        github.com/ProtonMail/go-crypto v0.0.0-20210705153151-cc34b1f6908b // indirect
        github.com/PuerkitoBio/goquery v1.7.0
-       github.com/alecthomas/chroma v0.9.4
+       github.com/alecthomas/chroma v0.10.0
        github.com/andybalholm/brotli v1.0.3 // indirect
        github.com/andybalholm/cascadia v1.2.0 // indirect
        github.com/blevesearch/bleve/v2 v2.3.0

diff --git a/go.sum b/go.sum
index 22fdb0b7ac661debd19834d148b97bb86e019efd..bccfe158eef1d1ecb41b8052d1f9ed7b2dccc9ea 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -94,8 +94,8 @@ github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4Rq
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
 github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a/go.mod h1:fv5SzZPFJbwp2NXJWpFIX7DZS4HgV1K4ew4Pc2OZD9s=
 github.com/alecthomas/chroma v0.8.2/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM=
-github.com/alecthomas/chroma v0.9.4 h1:YL7sOAE3p8HS96T9km7RgvmsZIctqbK1qJ0b7hzed44=
-github.com/alecthomas/chroma v0.9.4/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
+github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
+github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
 github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
 github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE=

diff --git a/modules/highlight/highlight_test.go b/modules/highlight/highlight_test.go
index 3f47b6a48f65d488ace823d41cd72d80cb5e4b61..2f305bb589c93a9233a31b4fa8f90cd55897fe75 100644 (file)
--- a/modules/highlight/highlight_test.go
+++ b/modules/highlight/highlight_test.go
@@ -40,20 +40,19 @@ steps:
        - go test -v -race -coverprofile=coverage.txt -covermode=atomic
 `,
                        want: []string{
-                               `<span class="nt">kind</span><span class="p">:</span><span class="w"> </span><span class="l">pipeline</span>`,
-                               `<span class="w"></span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">default</span>`,
-                               `<span class="w">
-</span>`,
-                               `<span class="w"></span><span class="nt">steps</span><span class="p">:</span>`,
-                               `<span class="w"></span>- <span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">test</span>`,
-                               `<span class="w">       </span><span class="nt">image</span><span class="p">:</span><span class="w"> </span><span class="l">golang:1.13</span>`,
-                               `<span class="w">       </span><span class="nt">environment</span><span class="p">:</span>`,
-                               `<span class="w"></span><span class="w">                </span><span class="nt">GOPROXY</span><span class="p">:</span><span class="w"> </span><span class="l">https://goproxy.cn</span>`,
-                               `<span class="w">       </span><span class="nt">commands</span><span class="p">:</span>`,
-                               `<span class="w"></span><span class="w">        </span>- <span class="l">go get -u</span>`,
-                               `<span class="w">       </span>- <span class="l">go build -v</span>`,
-                               `<span class="w">       </span>- <span class="l">go test -v -race -coverprofile=coverage.txt -covermode=atomic</span><span class="w">
-</span>`,
+                               `<span class="line"><span class="cl"><span class="nt">kind</span><span class="p">:</span><span class="w"> </span><span class="l">pipeline</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">default</span>`,
+                               `</span></span><span class="line"><span class="cl">`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span><span class="nt">steps</span><span class="p">:</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span>- <span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">test</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span><span class="nt">image</span><span class="p">:</span><span class="w"> </span><span class="l">golang:1.13</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span><span class="nt">environment</span><span class="p">:</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span><span class="w">              </span><span class="nt">GOPROXY</span><span class="p">:</span><span class="w"> </span><span class="l">https://goproxy.cn</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span><span class="nt">commands</span><span class="p">:</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span><span class="w">      </span>- <span class="l">go get -u</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span>- <span class="l">go build -v</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span>- <span class="l">go test -v -race -coverprofile=coverage.txt -covermode=atomic</span><span class="w">
+</span></span></span>`,
                                `<span class="w">
 </span>`,
                        },
@@ -76,20 +75,19 @@ steps:
        - go test -v -race -coverprofile=coverage.txt -covermode=atomic
        `,
                        want: []string{
-                               `<span class="nt">kind</span><span class="p">:</span><span class="w"> </span><span class="l">pipeline</span>`,
-                               `<span class="w"></span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">default  </span>`,
-                               `<span class="w">
-</span>`,
-                               `<span class="w"></span><span class="nt">steps</span><span class="p">:</span>`,
-                               `<span class="w"></span>- <span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">test</span>`,
-                               `<span class="w">       </span><span class="nt">image</span><span class="p">:</span><span class="w"> </span><span class="l">golang:1.13</span>`,
-                               `<span class="w">       </span><span class="nt">environment</span><span class="p">:</span>`,
-                               `<span class="w"></span><span class="w">                </span><span class="nt">GOPROXY</span><span class="p">:</span><span class="w"> </span><span class="l">https://goproxy.cn</span>`,
-                               `<span class="w">       </span><span class="nt">commands</span><span class="p">:</span>`,
-                               `<span class="w"></span><span class="w">        </span>- <span class="l">go get -u</span>`,
-                               `<span class="w">       </span>- <span class="l">go build -v</span>`,
-                               `<span class="w">       </span>- <span class="l">go test -v -race -coverprofile=coverage.txt -covermode=atomic</span>`,
-                               `<span class="w">       </span>`,
+                               `<span class="line"><span class="cl"><span class="nt">kind</span><span class="p">:</span><span class="w"> </span><span class="l">pipeline</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">default  </span>`,
+                               `</span></span><span class="line"><span class="cl">`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span><span class="nt">steps</span><span class="p">:</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span>- <span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">test</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span><span class="nt">image</span><span class="p">:</span><span class="w"> </span><span class="l">golang:1.13</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span><span class="nt">environment</span><span class="p">:</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span><span class="w">              </span><span class="nt">GOPROXY</span><span class="p">:</span><span class="w"> </span><span class="l">https://goproxy.cn</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span><span class="nt">commands</span><span class="p">:</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w"></span><span class="w">      </span>- <span class="l">go get -u</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span>- <span class="l">go build -v</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span>- <span class="l">go test -v -race -coverprofile=coverage.txt -covermode=atomic</span>`,
+                               `</span></span><span class="line"><span class="cl"><span class="w">     </span></span></span>`,
                        },
                },
        }

diff --git a/modules/markup/orgmode/orgmode_test.go b/modules/markup/orgmode/orgmode_test.go
index 81d0d66a76c5be5a3315cf0be5cc2f3ab0f155f7..38c010ef68d943add3c786b704353cbe3698107d 100644 (file)
--- a/modules/markup/orgmode/orgmode_test.go
+++ b/modules/markup/orgmode/orgmode_test.go
@@ -77,9 +77,9 @@ func HelloWorld() {
 }
 #+end_src
 `, `<div class="src src-go">
-<pre><code class="chroma language-go"><span class="c1">// HelloWorld prints &#34;Hello World&#34;
-</span><span class="c1"></span><span class="kd">func</span> <span class="nf">HelloWorld</span><span class="p">()</span> <span class="p">{</span>
-       <span class="nx">fmt</span><span class="p">.</span><span class="nf">Println</span><span class="p">(</span><span class="s">&#34;Hello World&#34;</span><span class="p">)</span>
-<span class="p">}</span></code></pre>
+<pre><code class="chroma language-go"><span class="line"><span class="cl"><span class="c1">// HelloWorld prints &#34;Hello World&#34;
+</span></span></span><span class="line"><span class="cl"><span class="c1"></span><span class="kd">func</span> <span class="nf">HelloWorld</span><span class="p">()</span> <span class="p">{</span>
+</span></span><span class="line"><span class="cl">     <span class="nx">fmt</span><span class="p">.</span><span class="nf">Println</span><span class="p">(</span><span class="s">&#34;Hello World&#34;</span><span class="p">)</span>
+</span></span><span class="line"><span class="cl"><span class="p">}</span></span></span></code></pre>
 </div>`)
 }

diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go
index 2f8b8491cd74b5ead8f68f82233608098152fde4..57cbb74b2208f8b3ba9d8268937708270bb6fc16 100644 (file)
--- a/services/gitdiff/gitdiff_test.go
+++ b/services/gitdiff/gitdiff_test.go
@@ -716,7 +716,8 @@ func TestDiffToHTML_14231(t *testing.T) {
        diffRecord := diffMatchPatch.DiffMain(highlight.Code("main.v", "", "            run()\n"), highlight.Code("main.v", "", "               run(db)\n"), true)
        diffRecord = diffMatchPatch.DiffCleanupEfficiency(diffRecord)
 
-       expected := `           <span class="n">run</span><span class="added-code"><span class="o">(</span><span class="n">db</span></span><span class="o">)</span>`
+       expected := `<span class="line"><span class="cl">               <span class="n">run</span><span class="added-code"><span class="o">(</span><span class="n">db</span></span><span class="o">)</span>
+</span></span>`
        output := diffToHTML("main.v", diffRecord, DiffLineAdd)
 
        assertEqual(t, expected, output.Content)