wire: remove color in wire show (#190)

Fixes #189
This commit is contained in:
Robert van Gent
2019-05-29 15:02:06 -07:00
committed by Ross Light
parent 89bcaa23b9
commit b5d7d7864b
2 changed files with 5 additions and 11 deletions

View File

@@ -31,7 +31,6 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/fatih/color"
"github.com/google/subcommands" "github.com/google/subcommands"
"github.com/google/wire/internal/wire" "github.com/google/wire/internal/wire"
"github.com/pmezard/go-difflib/difflib" "github.com/pmezard/go-difflib/difflib"
@@ -284,18 +283,17 @@ func (*showCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{
} }
return keys[i].ImportPath < keys[j].ImportPath return keys[i].ImportPath < keys[j].ImportPath
}) })
boldRed := color.New(color.FgRed).Add(color.Bold)
for i, k := range keys { for i, k := range keys {
if i > 0 { if i > 0 {
fmt.Println() fmt.Println()
} }
outGroups, imports := gather(info, k) outGroups, imports := gather(info, k)
boldRed.Println(k) fmt.Println(k)
for _, imp := range sortSet(imports) { for _, imp := range sortSet(imports) {
fmt.Printf("\t%s\n", imp) fmt.Printf("\t%s\n", imp)
} }
for i := range outGroups { for i := range outGroups {
color.Blue("Outputs given %s:", outGroups[i].name) fmt.Printf("\tOutputs given %s:\n", outGroups[i].name)
out := make(map[string]token.Pos, outGroups[i].outputs.Len()) out := make(map[string]token.Pos, outGroups[i].outputs.Len())
outGroups[i].outputs.Iterate(func(t types.Type, v interface{}) { outGroups[i].outputs.Iterate(func(t types.Type, v interface{}) {
switch v := v.(type) { switch v := v.(type) {
@@ -310,8 +308,8 @@ func (*showCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{
} }
}) })
for _, t := range sortSet(out) { for _, t := range sortSet(out) {
color.Green("\t%s", t) fmt.Printf("\t\t%s\n", t)
fmt.Printf("\t\tat %v\n", info.Fset.Position(out[t])) fmt.Printf("\t\t\tat %v\n", info.Fset.Position(out[t]))
} }
} }
} }
@@ -323,7 +321,7 @@ func (*showCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{
} }
return injectors[i].ImportPath < injectors[j].ImportPath return injectors[i].ImportPath < injectors[j].ImportPath
}) })
boldRed.Println("Injectors:") fmt.Println("\nInjectors:")
for _, in := range injectors { for _, in := range injectors {
fmt.Printf("\t%v\n", in) fmt.Printf("\t%v\n", in)
} }

View File

@@ -1,8 +1,4 @@
github.com/fatih/color
github.com/google/subcommands github.com/google/subcommands
github.com/google/wire github.com/google/wire
github.com/mattn/go-colorable
github.com/mattn/go-isatty
github.com/pmezard/go-difflib github.com/pmezard/go-difflib
golang.org/x/sys
golang.org/x/tools golang.org/x/tools