summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormjarkk <mkopenga@gmail.com>2021-07-27 15:00:37 +0200
committermjarkk <mkopenga@gmail.com>2021-07-30 15:14:46 +0200
commit79848087bccd5c87af1dbb44a39753aad1346f8b (patch)
tree07e4b6eb4b7ed5fdcbde8d697a214b647ddd0536
parenta3b820fb5f20f4a24028ecbf285d54bbaa7b6974 (diff)
Switch to github.com/gookit/color for terminal colors
-rw-r--r--docs/Config.md2
-rw-r--r--go.mod5
-rw-r--r--go.sum10
-rw-r--r--pkg/commands/loading_commits.go5
-rw-r--r--pkg/commands/patch/patch_parser.go37
-rw-r--r--pkg/gui/branches_panel.go2
-rw-r--r--pkg/gui/command_log_panel.go15
-rw-r--r--pkg/gui/confirmation_panel.go5
-rw-r--r--pkg/gui/custom_commands.go4
-rw-r--r--pkg/gui/gui.go6
-rw-r--r--pkg/gui/information_panel.go6
-rw-r--r--pkg/gui/list_context_config.go5
-rw-r--r--pkg/gui/mergeconflicts/rendering.go13
-rw-r--r--pkg/gui/modes.go37
-rw-r--r--pkg/gui/options_menu_panel.go9
-rw-r--r--pkg/gui/presentation/branches.go31
-rw-r--r--pkg/gui/presentation/commit_files.go31
-rw-r--r--pkg/gui/presentation/commits.go104
-rw-r--r--pkg/gui/presentation/files.go23
-rw-r--r--pkg/gui/presentation/reflog_commits.go16
-rw-r--r--pkg/gui/presentation/remote_branches.go5
-rw-r--r--pkg/gui/presentation/remotes.go7
-rw-r--r--pkg/gui/presentation/stash_entries.go3
-rw-r--r--pkg/gui/presentation/submodules.go3
-rw-r--r--pkg/gui/presentation/tags.go3
-rw-r--r--pkg/gui/recent_repos_panel.go6
-rw-r--r--pkg/gui/remotes_panel.go4
-rw-r--r--pkg/gui/reset_menu_panel.go6
-rw-r--r--pkg/gui/searching.go19
-rw-r--r--pkg/gui/status_panel.go10
-rw-r--r--pkg/gui/style/basic.go147
-rw-r--r--pkg/gui/style/rgb.go111
-rw-r--r--pkg/gui/style/style.go97
-rw-r--r--pkg/gui/style/style_test.go314
-rw-r--r--pkg/gui/submodules_panel.go17
-rw-r--r--pkg/gui/workspace_reset_options_panel.go4
-rw-r--r--pkg/theme/theme.go137
-rw-r--r--pkg/utils/color.go37
-rw-r--r--pkg/utils/color_test.go (renamed from pkg/theme/theme_test.go)4
-rw-r--r--test/lazyintegration/main.go15
-rw-r--r--vendor/github.com/gookit/color/.gitignore20
-rw-r--r--vendor/github.com/gookit/color/LICENSE20
-rw-r--r--vendor/github.com/gookit/color/README.md468
-rw-r--r--vendor/github.com/gookit/color/README.zh-CN.md472
-rw-r--r--vendor/github.com/gookit/color/color.go238
-rw-r--r--vendor/github.com/gookit/color/color_16.go440
-rw-r--r--vendor/github.com/gookit/color/color_256.go308
-rw-r--r--vendor/github.com/gookit/color/color_rgb.go391
-rw-r--r--vendor/github.com/gookit/color/color_tag.go427
-rw-r--r--vendor/github.com/gookit/color/convert.go593
-rw-r--r--vendor/github.com/gookit/color/detect_env.go281
-rw-r--r--vendor/github.com/gookit/color/detect_nonwin.go48
-rw-r--r--vendor/github.com/gookit/color/detect_windows.go243
-rw-r--r--vendor/github.com/gookit/color/go.mod9
-rw-r--r--vendor/github.com/gookit/color/go.sum15
-rw-r--r--vendor/github.com/gookit/color/printer.go122
-rw-r--r--vendor/github.com/gookit/color/quickstart.go109
-rw-r--r--vendor/github.com/gookit/color/style.go315
-rw-r--r--vendor/github.com/gookit/color/utils.go206
-rw-r--r--vendor/github.com/stretchr/testify/LICENSE2
-rw-r--r--vendor/github.com/stretchr/testify/assert/assertion_compare.go (renamed from vendor/github.com/stretchr/testify/assert/assertion_order.go)173
-rw-r--r--vendor/github.com/stretchr/testify/assert/assertion_format.go118
-rw-r--r--vendor/github.com/stretchr/testify/assert/assertion_forward.go218
-rw-r--r--vendor/github.com/stretchr/testify/assert/assertions.go405
-rw-r--r--vendor/github.com/stretchr/testify/assert/forward_assertions.go2
-rw-r--r--vendor/github.com/stretchr/testify/assert/http_assertions.go25
-rw-r--r--vendor/github.com/xo/terminfo/.gitignore9
-rw-r--r--vendor/github.com/xo/terminfo/LICENSE21
-rw-r--r--vendor/github.com/xo/terminfo/README.md139
-rw-r--r--vendor/github.com/xo/terminfo/caps.go33
-rw-r--r--vendor/github.com/xo/terminfo/capvals.go2023
-rw-r--r--vendor/github.com/xo/terminfo/color.go91
-rw-r--r--vendor/github.com/xo/terminfo/go.mod3
-rw-r--r--vendor/github.com/xo/terminfo/go.sum0
-rw-r--r--vendor/github.com/xo/terminfo/load.go72
-rw-r--r--vendor/github.com/xo/terminfo/param.go490
-rw-r--r--vendor/github.com/xo/terminfo/stack.go48
-rw-r--r--vendor/github.com/xo/terminfo/terminfo.go538
-rw-r--r--vendor/github.com/xo/terminfo/util.go266
-rw-r--r--vendor/gopkg.in/yaml.v2/LICENSE201
-rw-r--r--vendor/gopkg.in/yaml.v2/encode.go390
-rw-r--r--vendor/gopkg.in/yaml.v2/writerc.go26
-rw-r--r--vendor/gopkg.in/yaml.v3/LICENSE (renamed from vendor/gopkg.in/yaml.v2/LICENSE.libyaml)39
-rw-r--r--vendor/gopkg.in/yaml.v3/NOTICE (renamed from vendor/gopkg.in/yaml.v2/NOTICE)0
-rw-r--r--vendor/gopkg.in/yaml.v3/README.md (renamed from vendor/gopkg.in/yaml.v2/README.md)31
-rw-r--r--vendor/gopkg.in/yaml.v3/apic.go (renamed from vendor/gopkg.in/yaml.v2/apic.go)56
-rw-r--r--vendor/gopkg.in/yaml.v3/decode.go (renamed from vendor/gopkg.in/yaml.v2/decode.go)542
-rw-r--r--vendor/gopkg.in/yaml.v3/emitterc.go (renamed from vendor/gopkg.in/yaml.v2/emitterc.go)377
-rw-r--r--vendor/gopkg.in/yaml.v3/encode.go561
-rw-r--r--vendor/gopkg.in/yaml.v3/go.mod (renamed from vendor/gopkg.in/yaml.v2/go.mod)2
-rw-r--r--vendor/gopkg.in/yaml.v3/parserc.go (renamed from vendor/gopkg.in/yaml.v2/parserc.go)136
-rw-r--r--vendor/gopkg.in/yaml.v3/readerc.go (renamed from vendor/gopkg.in/yaml.v2/readerc.go)24
-rw-r--r--vendor/gopkg.in/yaml.v3/resolve.go (renamed from vendor/gopkg.in/yaml.v2/resolve.go)138
-rw-r--r--vendor/gopkg.in/yaml.v3/scannerc.go (renamed from vendor/gopkg.in/yaml.v2/scannerc.go)350
-rw-r--r--vendor/gopkg.in/yaml.v3/sorter.go (renamed from vendor/gopkg.in/yaml.v2/sorter.go)25
-rw-r--r--vendor/gopkg.in/yaml.v3/writerc.go48
-rw-r--r--vendor/gopkg.in/yaml.v3/yaml.go (renamed from vendor/gopkg.in/yaml.v2/yaml.go)304
-rw-r--r--vendor/gopkg.in/yaml.v3/yamlh.go (renamed from vendor/gopkg.in/yaml.v2/yamlh.go)78
-rw-r--r--vendor/gopkg.in/yaml.v3/yamlprivateh.go (renamed from vendor/gopkg.in/yaml.v2/yamlprivateh.go)37
-rw-r--r--vendor/modules.txt11
100 files changed, 12397 insertions, 1695 deletions
diff --git a/docs/Config.md b/docs/Config.md
index 1e4f2d6ed..c2565ae93 100644
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -265,7 +265,7 @@ The available attributes are:
- magenta
- cyan
- white
-- '#ff00ff' # can't be used on text
+- '#ff00ff'
**Modifiers**
diff --git a/go.mod b/go.mod
index 70f5a6fef..fb9c0d6a4 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
github.com/cli/safeexec v1.0.0
github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
github.com/creack/pty v1.1.11
- github.com/fatih/color v1.9.0
+ github.com/fatih/color v1.9.0 // indirect
github.com/fsnotify/fsnotify v1.4.7
github.com/gdamore/tcell/v2 v2.3.11 // indirect
github.com/go-errors/errors v1.4.0
@@ -17,6 +17,7 @@ require (
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
github.com/golang/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.3.1 // indirect
+ github.com/gookit/color v1.4.2
github.com/imdario/mergo v0.3.11
github.com/integrii/flaggy v1.4.0
github.com/jesseduffield/go-git/v5 v5.1.2-0.20201006095850-341962be15a4
@@ -35,7 +36,7 @@ require (
github.com/sahilm/fuzzy v0.1.0
github.com/sirupsen/logrus v1.4.2
github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
- github.com/stretchr/testify v1.4.0
+ github.com/stretchr/testify v1.6.1
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c // indirect
golang.org/x/sys v0.0.0-20210611083646-a4fc73990273 // indirect
diff --git a/go.sum b/go.sum
index 0b6b4d8d0..74ab44b7d 100644
--- a/go.sum
+++ b/go.sum
@@ -57,6 +57,8 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk=
+github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -138,11 +140,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/urfave/cli v1.20.1-0.20180226030253-8e01ec4cd3e2/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -169,6 +174,7 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210611083646-a4fc73990273 h1:faDu4veV+8pcThn4fewv6TVlNCezafGoC1gM/mxQLbQ=
golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -193,3 +199,5 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/pkg/commands/loading_commits.go b/pkg/commands/loading_commits.go
index bf7e4cf56..28e9c5199 100644
--- a/pkg/commands/loading_commits.go
+++ b/pkg/commands/loading_commits.go
@@ -10,9 +10,9 @@ import (
"strconv"
"strings"
- "github.com/fatih/color"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+ "github.com/jesseduffield/lazygit/pkg/gui/style"
"github.com/jesseduffield/lazygit/pkg/i18n"
"github.com/sirupsen/logrus"
)
@@ -165,8 +165,7 @@ func (c *CommitListBuilder) GetCommits(opts GetCommitsOptions) ([]*models.Commit
if rebaseMode != "" {
currentCommit := commits[len(rebasingCommits)]
- blue := color.New(color.FgYellow)
- youAreHere := blue.Sprintf("<-- %s ---", c.Tr.YouAreHere)
+ youAreHere := style.FgYellow.Sprintf("<-- %s ---", c.Tr.YouAreHere)
currentCommit.Name = fmt.Sprintf("%s %s", youAreHere, currentCommit.Name)