Skip to content

Add noinlineerr linter #5826

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

Open
wants to merge 4 commits into
base: main
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
2 changes: 2 additions & 0 deletions .golangci.next.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ linters:
- nilnil
- nlreturn
- noctx
- noinlineerr
- nolintlint
- nonamedreturns
- nosprintfhostport
Expand Down Expand Up @@ -200,6 +201,7 @@ linters:
- nilnil
- nlreturn
- noctx
- noinlineerr
- nolintlint
- nonamedreturns
- nosprintfhostport
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
4d63.com/gochecknoglobals v0.2.2
github.com/4meepo/tagalign v1.4.2
github.com/Abirdcfly/dupword v0.1.4
github.com/AlwxSin/noinlineerr v1.0.2
github.com/Antonboom/errname v1.1.0
github.com/Antonboom/nilnil v1.1.0
github.com/Antonboom/testifylint v1.6.1
Expand Down
2 changes: 2 additions & 0 deletions go.sum

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

1 change: 1 addition & 0 deletions jsonschema/golangci.next.jsonschema.json
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,7 @@
"nilnil",
"nlreturn",
"noctx",
"noinlineerr",
"nolintlint",
"nonamedreturns",
"nosprintfhostport",
Expand Down
18 changes: 18 additions & 0 deletions pkg/golinters/noinlineerr/noinlineerr.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package noinlineerr

import (
"github.com/AlwxSin/noinlineerr"
"golang.org/x/tools/go/analysis"

"github.com/golangci/golangci-lint/v2/pkg/goanalysis"
)

func New() *goanalysis.Linter {
analyzer := noinlineerr.NewAnalyzer()
return goanalysis.NewLinter(
analyzer.Name,
analyzer.Doc,
[]*analysis.Analyzer{analyzer},
nil,
).WithLoadMode(goanalysis.LoadModeTypesInfo)
}
11 changes: 11 additions & 0 deletions pkg/golinters/noinlineerr/noinlineerr_integration_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package noinlineerr

import (
"testing"

"github.com/golangci/golangci-lint/v2/test/testshared/integration"
)

func TestFromTestdata(t *testing.T) {
integration.RunTestdata(t)
}
53 changes: 53 additions & 0 deletions pkg/golinters/noinlineerr/testdata/noinlineerr.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
//golangcitest:args -Enoinlineerr
package testdata

import "fmt"

func doSomething() error {
return nil
}

func doSmthManyArgs(a, b, c, d int) error {
return nil
}

func doSmthMultipleReturn() (bool, error) {
return false, nil
}

func valid() error {
err := doSomething() // ok
if err != nil {
return err
}

err = doSmthManyArgs(0, 0, 0, 0) // ok
if err != nil {
return err
}

ok, err := doSmthMultipleReturn() // ok
if err != nil {
return fmt.Errorf("%b; %w", ok, err)
}
return nil
}

func invalid() error {
if err := doSomething(); err != nil { // want "avoid inline error handling using `if err := ...; err != nil; use plain assignment `err := ..."
return err
}

if err := doSmthManyArgs(0, // want "avoid inline error handling using `if err := ...; err != nil; use plain assignment `err := ..."
0,
0,
0,
); err != nil {
return err
}

if ok, err := doSmthMultipleReturn(); err != nil { // want "avoid inline error handling using `if err := ...; err != nil; use plain assignment `err := ..."
return fmt.Errorf("%b; %w", ok, err)
}
return nil
}
6 changes: 6 additions & 0 deletions pkg/lint/lintersdb/builder_linter.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ import (
"github.com/golangci/golangci-lint/v2/pkg/golinters/nilnil"
"github.com/golangci/golangci-lint/v2/pkg/golinters/nlreturn"
"github.com/golangci/golangci-lint/v2/pkg/golinters/noctx"
"github.com/golangci/golangci-lint/v2/pkg/golinters/noinlineerr"
"github.com/golangci/golangci-lint/v2/pkg/golinters/nolintlint"
"github.com/golangci/golangci-lint/v2/pkg/golinters/nonamedreturns"
"github.com/golangci/golangci-lint/v2/pkg/golinters/nosprintfhostport"
Expand Down Expand Up @@ -511,6 +512,11 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
WithLoadForGoAnalysis().
WithURL("https://github.com/sonatard/noctx"),

linter.NewConfig(noinlineerr.New()).
WithSince("v2.2.0").
WithLoadForGoAnalysis().
WithURL("https://github.com/AlwxSin/noinlineerr"),

linter.NewConfig(nonamedreturns.New(&cfg.Linters.Settings.NoNamedReturns)).
WithSince("v1.46.0").
WithLoadForGoAnalysis().
Expand Down