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.

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

build(deps): bump github.com/stretchr/testify from 1.7.0 to 1.8.2 #178

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ require (
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.10.1
github.com/ssgreg/nlreturn/v2 v2.2.1
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.2
github.com/sylvia7788/contextcheck v1.0.4
github.com/tdakkota/asciicheck v0.1.1
github.com/tetafro/godot v1.4.11
Expand All @@ -95,7 +95,7 @@ require (
github.com/yeya24/promlinter v0.1.1-0.20210918184747-d757024714a1
gitlab.com/bosi/decorder v0.2.1
golang.org/x/tools v0.1.10
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
gopkg.in/yaml.v3 v3.0.1
honnef.co/go/tools v0.2.2
mvdan.cc/gofumpt v0.3.0
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed
Expand Down Expand Up @@ -150,7 +150,7 @@ require (
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.9 // indirect
github.com/tklauser/numcpus v0.3.0 // indirect
Expand Down
20 changes: 9 additions & 11 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions pkg/golinters/goanalysis/linter.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"golang.org/x/tools/go/analysis"

"github.com/golangci/golangci-lint/pkg/lint/linter"
libpackages "github.com/golangci/golangci-lint/pkg/packages"
"github.com/golangci/golangci-lint/pkg/result"
)

Expand Down Expand Up @@ -144,6 +145,31 @@ func (lnt *Linter) configure() error {
return nil
}

func buildIssuesFromErrorsForTypecheckMode(errs []error, lintCtx *linter.Context) ([]result.Issue, error) {
var issues []result.Issue
uniqReportedIssues := map[string]bool{}
for _, err := range errs {
itErr, ok := errors.Cause(err).(*IllTypedError)
if !ok {
return nil, err
}
for _, err := range libpackages.ExtractErrors(itErr.Pkg) {
i, perr := parseError(err)
if perr != nil { // failed to parse
if uniqReportedIssues[err.Msg] {
continue
}
uniqReportedIssues[err.Msg] = true
lintCtx.Log.Errorf("typechecking error: %s", err.Msg)
} else {
i.Pkg = itErr.Pkg // to save to cache later
issues = append(issues, *i)
}
}
}
return issues, nil
}

func (lnt *Linter) preRun(lintCtx *linter.Context) error {
if err := analysis.Validate(lnt.analyzers); err != nil {
return errors.Wrap(err, "failed to validate analyzers")
Expand Down
236 changes: 236 additions & 0 deletions pkg/golinters/goanalysis/linter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@ package goanalysis

import (
"fmt"
"go/token"
"reflect"
"testing"

"github.com/golangci/golangci-lint/pkg/result"

"github.com/stretchr/testify/assert"
"golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/packages"
)

Expand Down Expand Up @@ -46,3 +51,234 @@ func TestParseError(t *testing.T) {
assert.Equal(t, "msg", i.Text)
}
}

func Test_buildIssues(t *testing.T) {
type args struct {
diags []Diagnostic
linterNameBuilder func(diag *Diagnostic) string
}
tests := []struct {
name string
args args
want []result.Issue
}{
{
name: "No Diagnostics",
args: args{
diags: []Diagnostic{},
linterNameBuilder: func(*Diagnostic) string {
return "some-linter"
},
},
want: []result.Issue(nil),
},
{
name: "Linter Name is Analyzer Name",
args: args{
diags: []Diagnostic{
{
Diagnostic: analysis.Diagnostic{
Message: "failure message",
},
Analyzer: &analysis.Analyzer{
Name: "some-linter",
},
Position: token.Position{},
Pkg: nil,
},
},
linterNameBuilder: func(*Diagnostic) string {
return "some-linter"
},
},
want: []result.Issue{
{
FromLinter: "some-linter",
Text: "failure message",
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := buildIssues(tt.args.diags, tt.args.linterNameBuilder); !reflect.DeepEqual(got, tt.want) {
t.Errorf("buildIssues() = %v, want %v", got, tt.want)
}
})
}
}

func Test_buildSingleIssue(t *testing.T) {
type args struct {
diag *Diagnostic
linterName string
}
fakePkg := packages.Package{
Fset: makeFakeFileSet(),
}
tests := []struct {
name string
args args
wantIssue result.Issue
}{
{
name: "Linter Name is Analyzer Name",
args: args{
diag: &Diagnostic{
Diagnostic: analysis.Diagnostic{
Message: "failure message",
},
Analyzer: &analysis.Analyzer{
Name: "some-linter",
},
Position: token.Position{},
Pkg: nil,
},

linterName: "some-linter",
},
wantIssue: result.Issue{
FromLinter: "some-linter",
Text: "failure message",
},
},
{
name: "Linter Name is NOT Analyzer Name",
args: args{
diag: &Diagnostic{
Diagnostic: analysis.Diagnostic{
Message: "failure message",
},
Analyzer: &analysis.Analyzer{
Name: "some-analyzer",
},
Position: token.Position{},
Pkg: nil,
},
linterName: "some-linter",
},
wantIssue: result.Issue{
FromLinter: "some-linter",
Text: "some-analyzer: failure message",
},
},
{
name: "Shows issue when suggested edits exist but has no TextEdits",
args: args{
diag: &Diagnostic{
Diagnostic: analysis.Diagnostic{
Message: "failure message",
SuggestedFixes: []analysis.SuggestedFix{
{
Message: "fix something",
TextEdits: []analysis.TextEdit{},
},
},
},
Analyzer: &analysis.Analyzer{
Name: "some-analyzer",
},
Position: token.Position{},
Pkg: nil,
},
linterName: "some-linter",
},
wantIssue: result.Issue{
FromLinter: "some-linter",
Text: "some-analyzer: failure message",
},
},
{
name: "Replace Whole Line",
args: args{
diag: &Diagnostic{
Diagnostic: analysis.Diagnostic{
Message: "failure message",
SuggestedFixes: []analysis.SuggestedFix{
{
Message: "fix something",
TextEdits: []analysis.TextEdit{
{
Pos: 101,
End: 201,
NewText: []byte("// Some comment to fix\n"),
},
},
},
},
},
Analyzer: &analysis.Analyzer{
Name: "some-analyzer",
},
Position: token.Position{},
Pkg: &fakePkg,
},
linterName: "some-linter",
},
wantIssue: result.Issue{
FromLinter: "some-linter",
Text: "some-analyzer: failure message",
LineRange: &result.Range{
From: 2,
To: 2,
},
Replacement: &result.Replacement{
NeedOnlyDelete: false,
NewLines: []string{
"// Some comment to fix",
},
},
Pkg: &fakePkg,
},
},
{
name: "Excludes Replacement if TextEdit doesn't modify only whole lines",
args: args{
diag: &Diagnostic{
Diagnostic: analysis.Diagnostic{
Message: "failure message",
SuggestedFixes: []analysis.SuggestedFix{
{
Message: "fix something",
TextEdits: []analysis.TextEdit{
{
Pos: 101,
End: 151,
NewText: []byte("// Some comment to fix\n"),
},
},
},
},
},
Analyzer: &analysis.Analyzer{
Name: "some-analyzer",
},
Position: token.Position{},
Pkg: &fakePkg,
},
linterName: "some-linter",
},
wantIssue: result.Issue{
FromLinter: "some-linter",
Text: "some-analyzer: failure message",
Pkg: &fakePkg,
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if gotIssues := buildSingleIssue(tt.args.diag, tt.args.linterName); !reflect.DeepEqual(gotIssues, tt.wantIssue) {
t.Errorf("buildSingleIssue() = %v, want %v", gotIssues, tt.wantIssue)
}
})
}
}

func makeFakeFileSet() *token.FileSet {
fSet := token.NewFileSet()
file := fSet.AddFile("fake.go", 1, 1000)
for i := 100; i < 1000; i += 100 {
file.AddLine(i)
}
return fSet
}
Loading