eeafj/golangci-lint
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

dev: remove unused ctx parameter from Printer (#3761)

Browse Source
This commit is contained in:
Oleksandr Redko 2023-04-16 19:18:53 +03:00 committed by GitHub
parent 8674597b84
commit 1948081d84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yml
View File

@ -71,6 +71,7 @@ linters-settings:
rules:
- name: unexported-return
disabled: true
- name: unused-parameter
linters:
disable-all: true

6
pkg/commands/run.go
View File

@ -411,7 +411,7 @@ func (e *Executor) runAndPrint(ctx context.Context, args []string) error {
out = append(out, "")
}
err := e.printReports(ctx, issues, out[1], out[0])
err := e.printReports(issues, out[1], out[0])
if err != nil {
return err
}
@ -424,7 +424,7 @@ func (e *Executor) runAndPrint(ctx context.Context, args []string) error {
return nil
}
func (e *Executor) printReports(ctx context.Context, issues []result.Issue, path, format string) error {
func (e *Executor) printReports(issues []result.Issue, path, format string) error {
w, shouldClose, err := e.createWriter(path)
if err != nil {
return fmt.Errorf("can't create output for %s: %w", path, err)
@ -438,7 +438,7 @@ func (e *Executor) printReports(ctx context.Context, issues []result.Issue, path
return err
}
if err = p.Print(ctx, issues); err != nil {
if err = p.Print(issues); err != nil {
if file, ok := w.(io.Closer); shouldClose && ok {
_ = file.Close()
}

4
pkg/golinters/gocritic_test.go
View File

@ -56,6 +56,6 @@ func (l *tLog) Infof(format string, args ...any) {
log.Printf(format, args...)
}
func (l *tLog) Child(name string) logutils.Log { return nil }
func (l *tLog) Child(_ string) logutils.Log { return nil }
func (l *tLog) SetLevel(level logutils.LogLevel) {}
func (l *tLog) SetLevel(_ logutils.LogLevel) {}

2
pkg/logutils/logutils.go
View File

@ -79,7 +79,7 @@ var enabledDebugs = getEnabledDebugs()
type DebugFunc func(format string, args ...any)
func nopDebugf(format string, args ...any) {}
func nopDebugf(_ string, _ ...any) {}
func Debug(tag string) DebugFunc {
if !enabledDebugs[tag] {

3
pkg/printers/checkstyle.go
View File

@ -1,7 +1,6 @@
package printers
import (
"context"
"encoding/xml"
"fmt"
"io"
@ -41,7 +40,7 @@ func NewCheckstyle(w io.Writer) *Checkstyle {
return &Checkstyle{w: w}
}
func (p Checkstyle) Print(ctx context.Context, issues []result.Issue) error {
func (p Checkstyle) Print(issues []result.Issue) error {
out := checkstyleOutput{
Version: "5.0",
}

3
pkg/printers/checkstyle_test.go
View File

@ -2,7 +2,6 @@ package printers
import (
"bytes"
"context"
"go/token"
"strings"
"testing"
@ -47,7 +46,7 @@ func TestCheckstyle_Print(t *testing.T) {
buf := new(bytes.Buffer)
printer := NewCheckstyle(buf)
err := printer.Print(context.Background(), issues)
err := printer.Print(issues)
require.NoError(t, err)
//nolint:lll

3
pkg/printers/codeclimate.go
View File

@ -1,7 +1,6 @@
package printers
import (
"context"
"encoding/json"
"fmt"
"io"
@ -35,7 +34,7 @@ func NewCodeClimate(w io.Writer) *CodeClimate {
return &CodeClimate{w: w}
}
func (p CodeClimate) Print(ctx context.Context, issues []result.Issue) error {
func (p CodeClimate) Print(issues []result.Issue) error {
codeClimateIssues := make([]CodeClimateIssue, 0, len(issues))
for i := range issues {
issue := &issues[i]

3
pkg/printers/codeclimate_test.go
View File

@ -2,7 +2,6 @@ package printers
import (
"bytes"
"context"
"go/token"
"testing"
@ -61,7 +60,7 @@ func TestCodeClimate_Print(t *testing.T) {
buf := new(bytes.Buffer)
printer := NewCodeClimate(buf)
err := printer.Print(context.Background(), issues)
err := printer.Print(issues)
require.NoError(t, err)
//nolint:lll

3
pkg/printers/github.go
View File

@ -1,7 +1,6 @@
package printers
import (
"context"
"fmt"
"io"
@ -36,7 +35,7 @@ func formatIssueAsGithub(issue *result.Issue) string {
return ret
}
func (p *github) Print(_ context.Context, issues []result.Issue) error {
func (p *github) Print(issues []result.Issue) error {
for ind := range issues {
_, err := fmt.Fprintln(p.w, formatIssueAsGithub(&issues[ind]))
if err != nil {

3
pkg/printers/github_test.go
View File

@ -3,7 +3,6 @@ package printers
import (
"bytes"
"context"
"go/token"
"testing"
@ -47,7 +46,7 @@ func TestGithub_Print(t *testing.T) {
buf := new(bytes.Buffer)
printer := NewGithub(buf)
err := printer.Print(context.Background(), issues)
err := printer.Print(issues)
require.NoError(t, err)
expected := `::warning file=path/to/filea.go,line=10,col=4::some issue (linter-a)

3
pkg/printers/html.go
View File

@ -1,7 +1,6 @@
package printers
import (
"context"
"fmt"
"html/template"
"io"
@ -131,7 +130,7 @@ func NewHTML(w io.Writer) *HTML {
return &HTML{w: w}
}
func (p HTML) Print(_ context.Context, issues []result.Issue) error {
func (p HTML) Print(issues []result.Issue) error {
var htmlIssues []htmlIssue
for i := range issues {

3
pkg/printers/html_test.go
View File

@ -2,7 +2,6 @@ package printers
import (
"bytes"
"context"
"go/token"
"testing"
@ -153,7 +152,7 @@ func TestHTML_Print(t *testing.T) {
buf := new(bytes.Buffer)
printer := NewHTML(buf)
err := printer.Print(context.Background(), issues)
err := printer.Print(issues)
require.NoError(t, err)
assert.Equal(t, expectedHTML, buf.String())

3
pkg/printers/json.go
View File

@ -1,7 +1,6 @@
package printers
import (
"context"
"encoding/json"
"io"
@ -26,7 +25,7 @@ type JSONResult struct {
Report *report.Data
}
func (p JSON) Print(ctx context.Context, issues []result.Issue) error {
func (p JSON) Print(issues []result.Issue) error {
res := JSONResult{
Issues: issues,
Report: p.rd,

3
pkg/printers/json_test.go
View File

@ -2,7 +2,6 @@ package printers
import (
"bytes"
"context"
"go/token"
"testing"
@ -47,7 +46,7 @@ func TestJSON_Print(t *testing.T) {
printer := NewJSON(nil, buf)
err := printer.Print(context.Background(), issues)
err := printer.Print(issues)
require.NoError(t, err)
//nolint:lll

3
pkg/printers/junitxml.go
View File

@ -1,7 +1,6 @@
package printers
import (
"context"
"encoding/xml"
"fmt"
"io"
@ -45,7 +44,7 @@ func NewJunitXML(w io.Writer) *JunitXML {
return &JunitXML{w: w}
}
func (p JunitXML) Print(ctx context.Context, issues []result.Issue) error {
func (p JunitXML) Print(issues []result.Issue) error {
suites := make(map[string]testSuiteXML) // use a map to group by file
for ind := range issues {

3
pkg/printers/junitxml_test.go
View File

@ -3,7 +3,6 @@ package printers
import (
"bytes"
"context"
"go/token"
"testing"
@ -47,7 +46,7 @@ func TestJunitXML_Print(t *testing.T) {
buf := new(bytes.Buffer)
printer := NewJunitXML(buf)
err := printer.Print(context.Background(), issues)
err := printer.Print(issues)
require.NoError(t, err)
expected := `<testsuites>

4
pkg/printers/printer.go
View File

@ -1,11 +1,9 @@
package printers
import (
"context"
"github.com/golangci/golangci-lint/pkg/result"
)
type Printer interface {
Print(ctx context.Context, issues []result.Issue) error
Print(issues []result.Issue) error
}

3
pkg/printers/tab.go
View File

@ -1,7 +1,6 @@
package printers
import (
"context"
"fmt"
"io"
"text/tabwriter"
@ -39,7 +38,7 @@ func (p *Tab) SprintfColored(ca color.Attribute, format string, args ...any) str
return c.Sprintf(format, args...)
}
func (p *Tab) Print(ctx context.Context, issues []result.Issue) error {
func (p *Tab) Print(issues []result.Issue) error {
w := tabwriter.NewWriter(p.w, 0, 0, 2, ' ', 0)
for i := range issues {

3
pkg/printers/tab_test.go
View File

@ -2,7 +2,6 @@ package printers
import (
"bytes"
"context"
"go/token"
"testing"
@ -92,7 +91,7 @@ path/to/fileb.go:300:9 another issue
printer := NewTab(test.printLinterName, test.useColors, logutils.NewStderrLog(logutils.DebugKeyEmpty), buf)
err := printer.Print(context.Background(), issues)
err := printer.Print(issues)
require.NoError(t, err)
assert.Equal(t, test.expected, buf.String())

3
pkg/printers/teamcity.go
View File

@ -1,7 +1,6 @@
package printers
import (
"context"
"fmt"
"io"
"strings"
@ -38,7 +37,7 @@ func NewTeamCity(w io.Writer) *TeamCity {
}
}
func (p *TeamCity) Print(_ context.Context, issues []result.Issue) error {
func (p *TeamCity) Print(issues []result.Issue) error {
uniqLinters := map[string]struct{}{}
for i := range issues {

3
pkg/printers/teamcity_test.go
View File

@ -2,7 +2,6 @@ package printers
import (
"bytes"
"context"
"go/token"
"testing"
@ -54,7 +53,7 @@ func TestTeamCity_Print(t *testing.T) {
buf := new(bytes.Buffer)
printer := NewTeamCity(buf)
err := printer.Print(context.Background(), issues)
err := printer.Print(issues)
require.NoError(t, err)
expected := `##teamcity[InspectionType id='linter-a' name='linter-a' description='linter-a' category='Golangci-lint reports']

3
pkg/printers/text.go
View File

@ -1,7 +1,6 @@
package printers
import (
"context"
"fmt"
"io"
"strings"
@ -41,7 +40,7 @@ func (p *Text) SprintfColored(ca color.Attribute, format string, args ...any) st
return c.Sprintf(format, args...)
}
func (p *Text) Print(ctx context.Context, issues []result.Issue) error {
func (p *Text) Print(issues []result.Issue) error {
for i := range issues {
p.printIssue(&issues[i])

3
pkg/printers/text_test.go
View File

@ -2,7 +2,6 @@ package printers
import (
"bytes"
"context"
"go/token"
"testing"
@ -120,7 +119,7 @@ path/to/fileb.go:300:9: another issue
printer := NewText(test.printIssuedLine, test.useColors, test.printLinterName, logutils.NewStderrLog(logutils.DebugKeyEmpty), buf)
err := printer.Print(context.Background(), issues)
err := printer.Print(issues)
require.NoError(t, err)
assert.Equal(t, test.expected, buf.String())