Skip to content

Commit f967598

Browse files
MrGussiozeripath
MrGussio
authored and
zeripath
committed
Updated Chroma to v0.10.0 (go-gitea#18270)
Backport go-gitea#18270 Fix tests for Chroma v0.10.0
1 parent f40e40d commit f967598

File tree

3 files changed

+32
-33
lines changed

3 files changed

+32
-33
lines changed

‎modules/highlight/highlight_test.go

+26-28
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,19 @@ steps:
4040
- go test -v -race -coverprofile=coverage.txt -covermode=atomic
4141
`,
4242
want: []string{
43-
`<span class="nt">kind</span><span class="p">:</span><span class="w"> </span><span class="l">pipeline</span>`,
44-
`<span class="w"></span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">default</span>`,
45-
`<span class="w">
46-
</span>`,
47-
`<span class="w"></span><span class="nt">steps</span><span class="p">:</span>`,
48-
`<span class="w"></span>- <span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">test</span>`,
49-
`<span class="w"> </span><span class="nt">image</span><span class="p">:</span><span class="w"> </span><span class="l">golang:1.13</span>`,
50-
`<span class="w"> </span><span class="nt">environment</span><span class="p">:</span>`,
51-
`<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>`,
52-
`<span class="w"> </span><span class="nt">commands</span><span class="p">:</span>`,
53-
`<span class="w"></span><span class="w"> </span>- <span class="l">go get -u</span>`,
54-
`<span class="w"> </span>- <span class="l">go build -v</span>`,
55-
`<span class="w"> </span>- <span class="l">go test -v -race -coverprofile=coverage.txt -covermode=atomic</span><span class="w">
56-
</span>`,
43+
`<span class="line"><span class="cl"><span class="nt">kind</span><span class="p">:</span><span class="w"> </span><span class="l">pipeline</span>`,
44+
`</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>`,
45+
`</span></span><span class="line"><span class="cl">`,
46+
`</span></span><span class="line"><span class="cl"><span class="w"></span><span class="nt">steps</span><span class="p">:</span>`,
47+
`</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>`,
48+
`</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>`,
49+
`</span></span><span class="line"><span class="cl"><span class="w"> </span><span class="nt">environment</span><span class="p">:</span>`,
50+
`</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>`,
51+
`</span></span><span class="line"><span class="cl"><span class="w"> </span><span class="nt">commands</span><span class="p">:</span>`,
52+
`</span></span><span class="line"><span class="cl"><span class="w"></span><span class="w"> </span>- <span class="l">go get -u</span>`,
53+
`</span></span><span class="line"><span class="cl"><span class="w"> </span>- <span class="l">go build -v</span>`,
54+
`</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">
55+
</span></span></span>`,
5756
`<span class="w">
5857
</span>`,
5958
},
@@ -76,20 +75,19 @@ steps:
7675
- go test -v -race -coverprofile=coverage.txt -covermode=atomic
7776
`,
7877
want: []string{
79-
`<span class="nt">kind</span><span class="p">:</span><span class="w"> </span><span class="l">pipeline</span>`,
80-
`<span class="w"></span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">default </span>`,
81-
`<span class="w">
82-
</span>`,
83-
`<span class="w"></span><span class="nt">steps</span><span class="p">:</span>`,
84-
`<span class="w"></span>- <span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l">test</span>`,
85-
`<span class="w"> </span><span class="nt">image</span><span class="p">:</span><span class="w"> </span><span class="l">golang:1.13</span>`,
86-
`<span class="w"> </span><span class="nt">environment</span><span class="p">:</span>`,
87-
`<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>`,
88-
`<span class="w"> </span><span class="nt">commands</span><span class="p">:</span>`,
89-
`<span class="w"></span><span class="w"> </span>- <span class="l">go get -u</span>`,
90-
`<span class="w"> </span>- <span class="l">go build -v</span>`,
91-
`<span class="w"> </span>- <span class="l">go test -v -race -coverprofile=coverage.txt -covermode=atomic</span>`,
92-
`<span class="w"> </span>`,
78+
`<span class="line"><span class="cl"><span class="nt">kind</span><span class="p">:</span><span class="w"> </span><span class="l">pipeline</span>`,
79+
`</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>`,
80+
`</span></span><span class="line"><span class="cl">`,
81+
`</span></span><span class="line"><span class="cl"><span class="w"></span><span class="nt">steps</span><span class="p">:</span>`,
82+
`</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>`,
83+
`</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>`,
84+
`</span></span><span class="line"><span class="cl"><span class="w"> </span><span class="nt">environment</span><span class="p">:</span>`,
85+
`</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>`,
86+
`</span></span><span class="line"><span class="cl"><span class="w"> </span><span class="nt">commands</span><span class="p">:</span>`,
87+
`</span></span><span class="line"><span class="cl"><span class="w"></span><span class="w"> </span>- <span class="l">go get -u</span>`,
88+
`</span></span><span class="line"><span class="cl"><span class="w"> </span>- <span class="l">go build -v</span>`,
89+
`</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>`,
90+
`</span></span><span class="line"><span class="cl"><span class="w"> </span></span></span>`,
9391
},
9492
},
9593
}

‎modules/markup/orgmode/orgmode_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ func HelloWorld() {
7777
}
7878
#+end_src
7979
`, `<div class="src src-go">
80-
<pre><code class="chroma language-go"><span class="c1">// HelloWorld prints &#34;Hello World&#34;
81-
</span><span class="c1"></span><span class="kd">func</span> <span class="nf">HelloWorld</span><span class="p">()</span> <span class="p">{</span>
82-
<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>
83-
<span class="p">}</span></code></pre>
80+
<pre><code class="chroma language-go"><span class="line"><span class="cl"><span class="c1">// HelloWorld prints &#34;Hello World&#34;
81+
</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>
82+
</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>
83+
</span></span><span class="line"><span class="cl"><span class="p">}</span></span></span></code></pre>
8484
</div>`)
8585
}

‎services/gitdiff/gitdiff_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,8 @@ func TestDiffToHTML_14231(t *testing.T) {
715715
diffRecord := diffMatchPatch.DiffMain(highlight.Code("main.v", "", " run()\n"), highlight.Code("main.v", "", " run(db)\n"), true)
716716
diffRecord = diffMatchPatch.DiffCleanupEfficiency(diffRecord)
717717

718-
expected := ` <span class="n">run</span><span class="added-code"><span class="o">(</span><span class="n">db</span></span><span class="o">)</span>`
718+
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>
719+
</span></span>`
719720
output := diffToHTML("main.v", diffRecord, DiffLineAdd)
720721

721722
assertEqual(t, expected, output.Content)

0 commit comments

Comments
 (0)