Skip to content

Commit 54fd3bc

Browse files
alecthomasalecthomas
committed
Clean up imports and make cmd/chroma its own module.
1 parent 9df8bd4 commit 54fd3bc

19 files changed

+59
-47
lines changed

Diff for: ‎.goreleaser.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ builds:
1818
- "386"
1919
goarm:
2020
- "6"
21-
main: ./cmd/chroma/main.go
21+
dir: ./cmd/chroma
22+
main: .
2223
ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
2324
binary: chroma
2425
archives:

Diff for: ‎cmd/chroma/go.mod

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module github.com/alecthomas/chroma/cmd/chroma
2+
3+
go 1.16
4+
5+
replace github.com/alecthomas/chroma => ../../
6+
7+
require (
8+
github.com/alecthomas/chroma v0.0.0-00010101000000-000000000000
9+
github.com/alecthomas/kong v0.2.17
10+
github.com/mattn/go-colorable v0.1.8
11+
github.com/mattn/go-isatty v0.0.13
12+
)

Diff for: ‎cmd/chroma/go.sum

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
github.com/alecthomas/kong v0.2.17 h1:URDISCI96MIgcIlQyoCAlhOmrSw6pZScBNkctg8r0W0=
2+
github.com/alecthomas/kong v0.2.17/go.mod h1:ka3VZ8GZNPXv9Ov+j4YNLkI8mTuhXyr/0ktSlqIydQQ=
3+
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ=
4+
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
5+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
7+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8+
github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
9+
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
10+
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
11+
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
12+
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
13+
github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
14+
github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
15+
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
16+
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
17+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
18+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
19+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
20+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
21+
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
22+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
23+
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
24+
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
25+
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
26+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
27+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
28+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
29+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

Diff for: ‎coalesce_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package chroma
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
6+
"github.com/stretchr/testify/assert"
77
)
88

99
func TestCoalesce(t *testing.T) {

Diff for: ‎colour_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package chroma
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
6+
"github.com/stretchr/testify/assert"
77
)
88

99
func TestColourRGB(t *testing.T) {

Diff for: ‎delegate_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package chroma
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
6+
"github.com/stretchr/testify/assert"
77
)
88

99
func makeDelegationTestLexers() (lang Lexer, root Lexer) {

Diff for: ‎formatters/html/html_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"testing"
99

10-
"github.com/alecthomas/assert"
10+
"github.com/stretchr/testify/assert"
1111

1212
"github.com/alecthomas/chroma"
1313
"github.com/alecthomas/chroma/lexers"

Diff for: ‎formatters/tty_indexed_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package formatters
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
76
"github.com/alecthomas/chroma"
7+
"github.com/stretchr/testify/assert"
88
)
99

1010
func TestClosestColour(t *testing.T) {

Diff for: ‎go.mod

+2-10
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,8 @@ module github.com/alecthomas/chroma
33
go 1.13
44

55
require (
6-
github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38
7-
github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 // indirect
8-
github.com/alecthomas/kong v0.2.4
9-
github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 // indirect
106
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964
7+
github.com/davecgh/go-spew v1.1.1 // indirect
118
github.com/dlclark/regexp2 v1.4.0
12-
github.com/mattn/go-colorable v0.1.6
13-
github.com/mattn/go-isatty v0.0.12
14-
github.com/pkg/errors v0.9.1 // indirect
15-
github.com/sergi/go-diff v1.0.0 // indirect
16-
github.com/stretchr/testify v1.3.0 // indirect
17-
golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
9+
github.com/stretchr/testify v1.3.0
1810
)

Diff for: ‎go.sum

-22
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,12 @@
1-
github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U=
2-
github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
3-
github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo=
4-
github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
5-
github.com/alecthomas/kong v0.2.4 h1:Y0ZBCHAvHhTHw7FFJ2FzCAAG4pkbTgA45nc7BpMhDNk=
6-
github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE=
7-
github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 h1:p9Sln00KOTlrYkxI1zYWl1QLnEqAqEARBEYa8FQnQcY=
8-
github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
91
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ=
102
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
113
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
124
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
135
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
146
github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
157
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
16-
github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
17-
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
18-
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
19-
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
20-
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
21-
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
22-
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
238
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
249
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
25-
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
26-
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
2710
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
28-
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
2911
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
3012
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
31-
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
32-
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
33-
golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
34-
golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

Diff for: ‎lexer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package chroma
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
6+
"github.com/stretchr/testify/assert"
77
)
88

99
func TestTokenTypeClassifiers(t *testing.T) {

Diff for: ‎lexers/c/cpp_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package c_test
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
6+
"github.com/stretchr/testify/assert"
77

88
"github.com/alecthomas/chroma"
99
"github.com/alecthomas/chroma/lexers/c"

Diff for: ‎lexers/g/go_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package g
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
76
"github.com/alecthomas/chroma"
7+
"github.com/stretchr/testify/assert"
88
)
99

1010
func TestGoHTMLTemplateIssue126(t *testing.T) {

Diff for: ‎lexers/lexer_benchmark_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package lexers_test
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
76
"github.com/alecthomas/chroma"
87
"github.com/alecthomas/chroma/lexers/g"
8+
"github.com/stretchr/testify/assert"
99
)
1010

1111
const lexerBenchSource = `// Copyright 2011 The Go Authors. All rights reserved.

Diff for: ‎lexers/lexers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"strings"
1010
"testing"
1111

12-
"github.com/alecthomas/assert"
1312
"github.com/alecthomas/chroma"
1413
"github.com/alecthomas/chroma/formatters"
1514
"github.com/alecthomas/chroma/lexers"
1615
"github.com/alecthomas/chroma/lexers/a"
1716
"github.com/alecthomas/chroma/lexers/x"
1817
"github.com/alecthomas/chroma/styles"
18+
"github.com/stretchr/testify/assert"
1919
)
2020

2121
func TestCompileAllRegexes(t *testing.T) {

Diff for: ‎mutators_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package chroma
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
6+
"github.com/stretchr/testify/assert"
77
)
88

99
func TestInclude(t *testing.T) {

Diff for: ‎regexp_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package chroma
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
6+
"github.com/stretchr/testify/assert"
77
)
88

99
func TestNewlineAtEndOfFile(t *testing.T) {

Diff for: ‎remap_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package chroma
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
6+
"github.com/stretchr/testify/assert"
77
)
88

99
func TestRemappingLexer(t *testing.T) {

Diff for: ‎style_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package chroma
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
6+
"github.com/stretchr/testify/assert"
77
)
88

99
func TestStyleInherit(t *testing.T) {

0 commit comments

Comments
 (0)