Skip to content

Commit

Permalink
print with colors the Message and code
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Vilgelm committed Feb 25, 2021
1 parent f1ea976 commit 2b7777c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
14 changes: 1 addition & 13 deletions pkg/golinters/goanalysis/linter.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,22 +228,10 @@ func buildIssues(diags []Diagnostic, linterNameBuilder func(diag *Diagnostic) st
text = fmt.Sprintf("%s: %s", diag.Analyzer.Name, diag.Message)
}

var suggestedFixes string
if len(diag.SuggestedFixes) > 0 {
elems := []string{}
for _, fix := range diag.SuggestedFixes {
elems = append(elems, fix.Message)
for _, text := range fix.TextEdits {
elems = append(elems, string(text.NewText))
}
}
suggestedFixes = strings.Join(elems, "\n")
}

issues = append(issues, result.Issue{
FromLinter: linterName,
Text: text,
SuggestedFixes: suggestedFixes,
SuggestedFixes: diag.SuggestedFixes,
Pos: diag.Position,
Pkg: diag.Pkg,
})
Expand Down
17 changes: 14 additions & 3 deletions pkg/printers/text.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,20 @@ func (p Text) printIssue(i *result.Issue) {
}

func (p Text) printSuggestedFixes(i *result.Issue) {
suggestedFixes := strings.TrimSpace(i.SuggestedFixes)
if suggestedFixes != "" {
fmt.Fprintln(logutils.StdOut, suggestedFixes)
var text string
if len(i.SuggestedFixes) > 0 {
for _, fix := range i.SuggestedFixes {
text += p.SprintfColored(color.FgRed, "%s\n", strings.TrimSpace(fix.Message))
elems := []string{}
for _, text := range fix.TextEdits {
elems = append(elems, strings.TrimSpace(string(text.NewText)))
}
text += strings.Join(elems, "\n") + "\n"
}
}

if text != "" {
fmt.Fprintln(logutils.StdOut, text)
}
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/result/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"go/token"

"golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/packages"
)

Expand All @@ -27,7 +28,7 @@ type InlineFix struct {
type Issue struct {
FromLinter string
Text string
SuggestedFixes string
SuggestedFixes []analysis.SuggestedFix

Severity string

Expand Down

0 comments on commit 2b7777c

Please sign in to comment.