Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Colorize help output #37

Merged
merged 2 commits into from
Sep 24, 2019
+6 −4
Merged

Colorize help output #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f8d900
Colorize make targets
zph Sep 23, 2019
bd13ef4
Fix indentation for help target
zph Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.13
require (
github.com/apex/log v1.1.1
github.com/campoy/tools v1.0.0 // indirect
github.com/fatih/color v1.7.0
github.com/pkg/errors v0.8.1
github.com/segmentio/go-env v1.1.0
)
9 changes: 5 additions & 4 deletions help/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"sort"
"strings"

"github.com/fatih/color"
"github.com/pkg/errors"

"github.com/tj/mmake/parser"
Expand All @@ -22,7 +23,7 @@ func OutputAllShort(r io.Reader, w io.Writer, targets []string) error {
return err
}

width := targetWidth(comments)
width := targetWidth(comments) + 15
fmt.Fprintf(w, "\n")
for _, c := range comments {
if c.Target == "" {
Expand Down Expand Up @@ -59,7 +60,7 @@ func OutputAllLong(r io.Reader, w io.Writer, targets []string) error {
// getComments parses, filters, and sorts all comment nodes.
func getComments(r io.Reader, targets []string) ([]parser.Comment, error) {
nodes, err := parser.ParseRecursive(r, resolver.IncludePath)

if err != nil {
return nil, errors.Wrap(err, "parsing")
}
Expand Down Expand Up @@ -126,7 +127,7 @@ func printVerbose(w io.Writer, c parser.Comment) (int, error) {
c.Value = c.Value + " (default)"
}

return fmt.Fprintf(w, " %-s:\n%-s\n\n", c.Target, indent(indent(c.Value)))
return fmt.Fprintf(w, " %-s:\n%-s\n\n", color.HiBlueString(c.Target), indent(indent(c.Value)))
}

func printShort(w io.Writer, c parser.Comment, width int) (int, error) {
Expand All @@ -135,5 +136,5 @@ func printShort(w io.Writer, c parser.Comment, width int) (int, error) {
comment = comment + " (default)"
}

return fmt.Fprintf(w, " %-*s %-s\n", width+2, c.Target, comment)
return fmt.Fprintf(w, " %-*s %-s\n", width+2, color.HiBlueString(c.Target), indent(indent(comment)))
}