From 8c3277e7b9c3998e434ad95922b99e6eba8012b1 Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Tue, 11 Oct 2022 10:40:25 +0200 Subject: Update to chroma v2 with sed support --- go.mod | 12 ++++-------- go.sum | 8 ++++++++ mpaste.go | 8 ++++---- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 60f438e..f8cdb9c 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,11 @@ module github.com/Mango0x45/mpaste -go 1.17 +go 1.19 require ( - github.com/Mango0x45/getgopt v0.0.0-20211008215918-31013048af5c - github.com/alecthomas/chroma v0.9.2 + github.com/alecthomas/chroma/v2 v2.3.1-0.20221008011915-b7c7bdbe65fb github.com/dgrijalva/jwt-go v3.2.0+incompatible + github.com/Mango0x45/getgopt v0.0.0-20220305004810-a883dbb3a127 ) -require ( - github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect - github.com/dlclark/regexp2 v1.4.0 // indirect - golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect -) +require github.com/dlclark/regexp2 v1.7.0 // indirect diff --git a/go.sum b/go.sum index 98f140c..5cf345c 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,15 @@ github.com/Mango0x45/getgopt v0.0.0-20211008215918-31013048af5c h1:nGtV2AJrDzl1NFcrVa0ybZlIrH2guRlndAa1qCVq5Xs= github.com/Mango0x45/getgopt v0.0.0-20211008215918-31013048af5c/go.mod h1:MgnwF7U7DDwnqtwEJ1nEbaBZVhRsI//AOXqH1C4nHTk= +github.com/Mango0x45/getgopt v0.0.0-20220305004810-a883dbb3a127 h1:DqvNETM/W3D4CbDNpUcL8M9Fah2DVV2ub00e97Dj6p4= +github.com/Mango0x45/getgopt v0.0.0-20220305004810-a883dbb3a127/go.mod h1:MgnwF7U7DDwnqtwEJ1nEbaBZVhRsI//AOXqH1C4nHTk= github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U= github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= github.com/alecthomas/chroma v0.9.2 h1:yU1sE2+TZbLIQPMk30SolL2Hn53SR/Pv750f7qZ/XMs= github.com/alecthomas/chroma v0.9.2/go.mod h1:eMuEnpA18XbG/WhOWtCzJHS7WqEtDAI+HxdwoW0nVSk= +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.3.1-0.20221008011915-b7c7bdbe65fb h1:HJuSWU49A24bpRH78Z+UPKlp14mEPJYmz+Wf/6LBBTQ= +github.com/alecthomas/chroma/v2 v2.3.1-0.20221008011915-b7c7bdbe65fb/go.mod h1:mZxeWZlxP2Dy+/8cBob2PYd8O2DwNAzave5AY7A2eQw= github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo= github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0= github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE= @@ -17,6 +23,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/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= diff --git a/mpaste.go b/mpaste.go index c306878..9383b63 100644 --- a/mpaste.go +++ b/mpaste.go @@ -12,11 +12,11 @@ import ( "strings" "sync" - "github.com/Mango0x45/getgopt" - "github.com/alecthomas/chroma/formatters/html" - "github.com/alecthomas/chroma/lexers" - "github.com/alecthomas/chroma/styles" + "github.com/alecthomas/chroma/v2/formatters/html" + "github.com/alecthomas/chroma/v2/lexers" + "github.com/alecthomas/chroma/v2/styles" "github.com/dgrijalva/jwt-go" + "github.com/Mango0x45/getgopt" ) const ( -- cgit v1.2.3