From 43e32300207565bcf84ad2abf49b36ef11d496bd Mon Sep 17 00:00:00 2001 From: Oleg Kovalov Date: Wed, 16 Feb 2022 14:49:50 +0100 Subject: [PATCH 1/2] all: drop bright package --- framework/lintmain/internal/check/check.go | 6 +----- go.mod | 1 - go.sum | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/framework/lintmain/internal/check/check.go b/framework/lintmain/internal/check/check.go index 62678e7b6..2dc755c29 100644 --- a/framework/lintmain/internal/check/check.go +++ b/framework/lintmain/internal/check/check.go @@ -22,7 +22,6 @@ import ( "github.com/go-critic/go-critic/framework/linter" "github.com/go-critic/go-critic/framework/lintmain/internal/hotload" "github.com/go-toolsmith/pkgload" - "github.com/logrusorgru/aurora" "golang.org/x/tools/go/packages" ) @@ -505,10 +504,7 @@ func (p *program) shortenLocation(loc string) string { func printWarning(p *program, rule, loc, warn string) { switch { case p.coloredOutput: - log.Printf("%v: %v: %v\n", - aurora.Magenta(aurora.Bold(loc)), - aurora.Red(rule), - warn) + log.Printf("%v: %v: %v\n", loc, rule, warn) default: log.Printf("%s: %s: %s\n", loc, rule, warn) diff --git a/go.mod b/go.mod index 2b081e413..32054af3b 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,6 @@ require ( github.com/go-toolsmith/strparse v1.0.0 github.com/go-toolsmith/typep v1.0.2 github.com/google/go-cmp v0.5.6 - github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e github.com/quasilyte/go-ruleguard v0.3.15 github.com/quasilyte/go-ruleguard/dsl v0.3.12 github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 diff --git a/go.sum b/go.sum index 29eb5fa87..73b837880 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,6 @@ github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e h1:9MlwzLdW7QSDrhDjFlsEYmxpFyIoXmYRon3dt0io31k= -github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= github.com/quasilyte/go-ruleguard v0.3.15 h1:iWYzp1z72IlXTioET0+XI6SjQdPfMGfuAiZiKznOt7g= github.com/quasilyte/go-ruleguard v0.3.15/go.mod h1:NhuWhnlVEM1gT1A4VJHYfy9MuYSxxwHgxWoPsn9llB4= From 7dabf30b7e2145871be6cac53e62840b34640188 Mon Sep 17 00:00:00 2001 From: Oleg Kovalov Date: Wed, 16 Feb 2022 15:01:23 +0100 Subject: [PATCH 2/2] remove flag --- framework/lintmain/internal/check/check.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/framework/lintmain/internal/check/check.go b/framework/lintmain/internal/check/check.go index 2dc755c29..2e150c5f5 100644 --- a/framework/lintmain/internal/check/check.go +++ b/framework/lintmain/internal/check/check.go @@ -92,7 +92,6 @@ type program struct { checkTests bool checkGenerated bool shorterErrLocation bool - coloredOutput bool verbose bool } @@ -168,7 +167,7 @@ func (p *program) checkFile(f *ast.File) { if p.shorterErrLocation { loc = p.shortenLocation(loc) } - printWarning(p, c.Info.Name, loc, warn.Text) + log.Printf("%s: %s: %s\n", loc, c.Info.Name, warn.Text) } } } @@ -364,8 +363,6 @@ func (p *program) parseArgs() error { `whether to check test files`) flag.BoolVar(&p.shorterErrLocation, `shorterErrLocation`, true, `whether to replace error location prefix with $GOROOT and $GOPATH`) - flag.BoolVar(&p.coloredOutput, `coloredOutput`, false, - `whether to use colored output`) flag.BoolVar(&p.verbose, "v", false, `whether to print output useful during linter debugging`) flag.StringVar(&p.goVersion, "go", "", @@ -501,16 +498,6 @@ func (p *program) shortenLocation(loc string) string { return loc } -func printWarning(p *program, rule, loc, warn string) { - switch { - case p.coloredOutput: - log.Printf("%v: %v: %v\n", loc, rule, warn) - - default: - log.Printf("%s: %s: %s\n", loc, rule, warn) - } -} - func loadPackages(cfg *packages.Config, patterns []string) ([]*packages.Package, error) { pkgs, err := packages.Load(cfg, patterns...) if err != nil {