From 59dafc373f4d6ba14379abd555ba71ab9ed50377 Mon Sep 17 00:00:00 2001 From: "Stanislav N. aka pztrn" Date: Sun, 14 Aug 2022 14:57:54 +0500 Subject: [PATCH] Update chroma to 2.2.0, line number links appeared. --- README.md | 2 +- domains/pastes/paste_get.go | 9 ++++----- go.mod | 2 ++ go.sum | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3f3fe2c..6b52410 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Easy-to-use-and-install pastebin software written in Go. No bells or whistles, n ## Caveats -* No links at lines numbers. See [this Chroma bug](https://github.com/alecthomas/chroma/issues/132) +* Not known at this moment. ## Installation and updating diff --git a/domains/pastes/paste_get.go b/domains/pastes/paste_get.go index a14b6b8..e2cc757 100644 --- a/domains/pastes/paste_get.go +++ b/domains/pastes/paste_get.go @@ -6,10 +6,9 @@ import ( "strconv" "time" - "github.com/alecthomas/chroma" - htmlfmt "github.com/alecthomas/chroma/formatters/html" - "github.com/alecthomas/chroma/lexers" - "github.com/alecthomas/chroma/styles" + htmlfmt "github.com/alecthomas/chroma/v2/formatters/html" + "github.com/alecthomas/chroma/v2/lexers" + "github.com/alecthomas/chroma/v2/styles" "github.com/labstack/echo" "go.dev.pztrn.name/fastpastebin/internal/database/dialects/flatfiles" "go.dev.pztrn.name/fastpastebin/internal/structs" @@ -167,7 +166,7 @@ func pasteGETWebInterface(ectx echo.Context) error { style = styles.Fallback } // Get HTML formatter. - formatter := chroma.Formatter(htmlfmt.New(htmlfmt.WithLineNumbers(true), htmlfmt.LineNumbersInTable(true), htmlfmt.LinkableLineNumbers(true, "L"))) + formatter := htmlfmt.New(htmlfmt.WithLineNumbers(true), htmlfmt.LineNumbersInTable(true), htmlfmt.LinkableLineNumbers(true, "L")) // Create buffer and format into it. buf := new(bytes.Buffer) diff --git a/go.mod b/go.mod index 4bfc06e..cb177fd 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,10 @@ go 1.16 require ( github.com/alecthomas/chroma v0.10.0 + github.com/alecthomas/chroma/v2 v2.2.0 // indirect github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect + github.com/dlclark/regexp2 v1.7.0 // indirect github.com/go-sql-driver/mysql v1.6.0 github.com/jmoiron/sqlx v1.3.5 github.com/kr/pretty v0.3.0 // indirect diff --git a/go.sum b/go.sum index f9c613e..30288a8 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,8 @@ 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/chroma/v2 v2.2.0 h1:Aten8jfQwUqEdadVFFjNyjx7HTexhKP0XuqBG67mRDY= +github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs= +github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -11,6 +14,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= 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/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=