deps: Upgrade github.com/alecthomas/chroma/v2 v2.4.0

diff --git a/go.mod b/go.mod
index a6f6e10ba7f43507fd2fc2d90089ac41dac3a302..b66c64397a11e3790ed4a31f55b496247177a449 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/gohugoio/hugo
 require (
        github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69
        github.com/PuerkitoBio/purell v1.1.1
-       github.com/alecthomas/chroma/v2 v2.3.0
+       github.com/alecthomas/chroma/v2 v2.4.0
        github.com/armon/go-radix v1.0.0
        github.com/aws/aws-sdk-go v1.43.5
        github.com/bep/clock v0.3.0
@@ -93,7 +93,7 @@ require (
        github.com/aws/aws-sdk-go-v2/service/sts v1.7.0 // indirect
        github.com/aws/smithy-go v1.8.0 // indirect
        github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-       github.com/dlclark/regexp2 v1.4.0 // indirect
+       github.com/dlclark/regexp2 v1.7.0 // indirect
        github.com/go-openapi/jsonpointer v0.19.5 // indirect
        github.com/go-openapi/swag v0.19.5 // indirect
        github.com/golang-jwt/jwt/v4 v4.0.0 // indirect

diff --git a/go.sum b/go.sum
index c9d81e955904f9f82d2429274213e05369019458..570f4786f48c52b6f8387d2d90c4fe977485d724 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -133,6 +133,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/alecthomas/chroma/v2 v2.3.0 h1:83xfxrnjv8eK+Cf8qZDzNo3PPF9IbTWHs7z28GY6D0U=
 github.com/alecthomas/chroma/v2 v2.3.0/go.mod h1:mZxeWZlxP2Dy+/8cBob2PYd8O2DwNAzave5AY7A2eQw=
+github.com/alecthomas/chroma/v2 v2.4.0 h1:Loe2ZjT5x3q1bcWwemqyqEi8p11/IV/ncFCeLYDpWC4=
+github.com/alecthomas/chroma/v2 v2.4.0/go.mod h1:6kHzqF5O6FUSJzBXW7fXELjb+e+7OXW4UpoPqMO7IBQ=
 github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
@@ -225,6 +227,8 @@ github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dU
 github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE=
 github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=
+github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

diff --git a/markup/goldmark/convert_test.go b/markup/goldmark/convert_test.go
index ab96b8c85d2cf59622ed009349a124a40055cb50..cbc49d0410ddbef7a0fbb90f9b14c16ad3cc8515 100644 (file)
--- a/markup/goldmark/convert_test.go
+++ b/markup/goldmark/convert_test.go
@@ -286,7 +286,7 @@ func TestConvertAttributes(t *testing.T) {
                                conf.Highlight.NoClasses = false
                        },
                        "```bash {linenos=table, anchorlinenos=true, lineanchors=org-coderef--xyz}\necho 'foo';\n```",
-                       "<div class=\"highlight\"><div class=\"chroma\">\n<table class=\"lntable\"><tr><td class=\"lntd\">\n<pre tabindex=\"0\" class=\"chroma\"><code><span class=\"lnt\" id=\"org-coderef--xyz-1\"><a style=\"outline: none; text-decoration:none; color:inherit\" href=\"#org-coderef--xyz-1\">1</a>\n</span></code></pre></td>\n<td class=\"lntd\">\n<pre tabindex=\"0\" class=\"chroma\"><code class=\"language-bash\" data-lang=\"bash\"><span class=\"line\"><span class=\"cl\"><span class=\"nb\">echo</span> <span class=\"s1\">&#39;foo&#39;</span><span class=\"p\">;</span>\n</span></span></code></pre></td></tr></table>\n</div>\n</div>",
+                       "<div class=\"highlight\"><div class=\"chroma\">\n<table class=\"lntable\"><tr><td class=\"lntd\">\n<pre tabindex=\"0\" class=\"chroma\"><code><span class=\"lnt\" id=\"org-coderef--xyz-1\"><a href=\"#org-coderef--xyz-1\">1</a>\n</span></code></pre></td>\n<td class=\"lntd\">\n<pre tabindex=\"0\" class=\"chroma\"><code class=\"language-bash\" data-lang=\"bash\"><span class=\"line\"><span class=\"cl\"><span class=\"nb\">echo</span> <span class=\"s1\">&#39;foo&#39;</span><span class=\"p\">;</span>\n</span></span></code></pre></td></tr></table>\n</div>\n</div>",
                },
                {
                        "Code block, CodeFences=true,lineanchors, default ordinal",
@@ -297,9 +297,9 @@ func TestConvertAttributes(t *testing.T) {
                        },
                        "```bash {linenos=inline, anchorlinenos=true}\necho 'foo';\nnecho 'bar';\n```\n\n```bash {linenos=inline, anchorlinenos=true}\necho 'baz';\nnecho 'qux';\n```",
                        []string{
-                               "<span class=\"ln\" id=\"hl-0-1\"><a style=\"outline: none; text-decoration:none; color:inherit\" href=\"#hl-0-1\">1</a></span><span class=\"cl\"><span class=\"nb\">echo</span> <span class=\"s1\">&#39;foo&#39;</span>",
-                               "<span class=\"ln\" id=\"hl-0-2\"><a style=\"outline: none; text-decoration:none; color:inherit\" href=\"#hl-0-2\">2</a></span><span class=\"cl\">necho <span class=\"s1\">&#39;bar&#39;</span>",
-                               "<span class=\"ln\" id=\"hl-1-2\"><a style=\"outline: none; text-decoration:none; color:inherit\" href=\"#hl-1-2\">2</a></span><span class=\"cl\">necho <span class=\"s1\">&#39;qux&#39;</span>",
+                               "<span class=\"ln\" id=\"hl-0-1\"><a class=\"lnlinks\" href=\"#hl-0-1\">1</a></span><span class=\"cl\"><span class=\"nb\">echo</span> <span class=\"s1\">&#39;foo&#39;</span>",
+                               "<span class=\"ln\" id=\"hl-0-2\"><a class=\"lnlinks\" href=\"#hl-0-2\">2</a></span><span class=\"cl\">necho <span class=\"s1\">&#39;bar&#39;</span>",
+                               "<span class=\"ln\" id=\"hl-1-2\"><a class=\"lnlinks\" href=\"#hl-1-2\">2</a></span><span class=\"cl\">necho <span class=\"s1\">&#39;qux&#39;</span>",
                        },
                },
                {

diff --git a/markup/highlight/config.go b/markup/highlight/config.go
index d55958d355b58f0d1eeca481ddedb5e72de96aee..9013dd07298e3a2558b08cb67fd7ff1c82986753 100644 (file)
--- a/markup/highlight/config.go
+++ b/markup/highlight/config.go
@@ -95,7 +95,7 @@ func (cfg Config) ToHTMLOptions() []html.Option {
                html.BaseLineNumber(cfg.LineNoStart),
                html.LineNumbersInTable(cfg.LineNumbersInTable),
                html.WithClasses(!cfg.NoClasses),
-               html.LinkableLineNumbers(cfg.AnchorLineNos, lineAnchors),
+               html.WithLinkableLineNumbers(cfg.AnchorLineNos, lineAnchors),
                html.InlineCode(cfg.Hl_inline),
        }
 

diff --git a/markup/highlight/highlight_test.go b/markup/highlight/highlight_test.go
index 53e53b1d9d2a3874cd21408ac204d5b8209c504b..662f07c93327c5b969678e165247d57ab95581b0 100644 (file)
--- a/markup/highlight/highlight_test.go
+++ b/markup/highlight/highlight_test.go
@@ -86,8 +86,7 @@ User-Agent: foo
                h := New(cfg)
 
                result, _ := h.Highlight(lines, "bash", "")
-               // From Chroma v0.8.2 this is linkable: https://github.com/alecthomas/chroma/commit/ab61726cdb54d5a98b6efe7ed76af6aa0698ab4a
-               c.Assert(result, qt.Contains, "<span class=\"lnt\" id=\"2\"><a style=\"outline: none; text-decoration:none; color:inherit\" href=\"#2\">2</a>\n</span>")
+               c.Assert(result, qt.Contains, "<span class=\"lnt\" id=\"2\"><a class=\"lnlinks\" href=\"#2\">2</a>\n</span>")
                result, _ = h.Highlight(lines, "bash", "lineanchors=test")
                result, _ = h.Highlight(lines, "bash", "anchorlinenos=false,hl_lines=2")
                c.Assert(result, qt.Not(qt.Contains), "id=\"2\"")