Skip to content

Commit 2b7777c

Browse files
author
Sergey Vilgelm
committed
print with colors the Message and code
1 parent f1ea976 commit 2b7777c

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

pkg/golinters/goanalysis/linter.go

+1-13
Original file line numberDiff line numberDiff line change
@@ -228,22 +228,10 @@ func buildIssues(diags []Diagnostic, linterNameBuilder func(diag *Diagnostic) st
228228
text = fmt.Sprintf("%s: %s", diag.Analyzer.Name, diag.Message)
229229
}
230230

231-
var suggestedFixes string
232-
if len(diag.SuggestedFixes) > 0 {
233-
elems := []string{}
234-
for _, fix := range diag.SuggestedFixes {
235-
elems = append(elems, fix.Message)
236-
for _, text := range fix.TextEdits {
237-
elems = append(elems, string(text.NewText))
238-
}
239-
}
240-
suggestedFixes = strings.Join(elems, "\n")
241-
}
242-
243231
issues = append(issues, result.Issue{
244232
FromLinter: linterName,
245233
Text: text,
246-
SuggestedFixes: suggestedFixes,
234+
SuggestedFixes: diag.SuggestedFixes,
247235
Pos: diag.Position,
248236
Pkg: diag.Pkg,
249237
})

pkg/printers/text.go

+14-3
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,20 @@ func (p Text) printIssue(i *result.Issue) {
6666
}
6767

6868
func (p Text) printSuggestedFixes(i *result.Issue) {
69-
suggestedFixes := strings.TrimSpace(i.SuggestedFixes)
70-
if suggestedFixes != "" {
71-
fmt.Fprintln(logutils.StdOut, suggestedFixes)
69+
var text string
70+
if len(i.SuggestedFixes) > 0 {
71+
for _, fix := range i.SuggestedFixes {
72+
text += p.SprintfColored(color.FgRed, "%s\n", strings.TrimSpace(fix.Message))
73+
elems := []string{}
74+
for _, text := range fix.TextEdits {
75+
elems = append(elems, strings.TrimSpace(string(text.NewText)))
76+
}
77+
text += strings.Join(elems, "\n") + "\n"
78+
}
79+
}
80+
81+
if text != "" {
82+
fmt.Fprintln(logutils.StdOut, text)
7283
}
7384
}
7485

pkg/result/issue.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"go/token"
77

8+
"golang.org/x/tools/go/analysis"
89
"golang.org/x/tools/go/packages"
910
)
1011

@@ -27,7 +28,7 @@ type InlineFix struct {
2728
type Issue struct {
2829
FromLinter string
2930
Text string
30-
SuggestedFixes string
31+
SuggestedFixes []analysis.SuggestedFix
3132

3233
Severity string
3334

0 commit comments

Comments
 (0)