Skip to content

fix: gocritic importshadow checker #5673

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Apr 1, 2025
Merged

fix: gocritic importshadow checker #5673

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8df382c
chore: split wrapper and settingsWrapper
ldez Apr 1, 2025
11ea4ab
chore: remove runOnPackage
ldez Apr 1, 2025
2068605
fix: importShadow
ldez Apr 1, 2025
7c37d1f
chore: lint
ldez Apr 1, 2025
950b770
test: add importShadow test
ldez Apr 1, 2025
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
8 changes: 4 additions & 4 deletions pkg/goformat/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"regexp"
"strings"

"github.com/rogpeppe/go-internal/diff"
rpdiff "github.com/rogpeppe/go-internal/diff"

"github.com/golangci/golangci-lint/v2/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/fsutils"
Expand All @@ -32,11 +32,11 @@ type Runner struct {
exitCode int
}

func NewRunner(log logutils.Log,
func NewRunner(logger logutils.Log,
metaFormatter *goformatters.MetaFormatter, matcher *processors.GeneratedFileMatcher,
opts RunnerOptions) *Runner {
return &Runner{
log: log,
log: logger,
matcher: matcher,
metaFormatter: metaFormatter,
opts: opts,
Expand Down Expand Up @@ -128,7 +128,7 @@ func (c *Runner) process(path string, stdout io.Writer, in io.Reader) error {
if c.opts.diff {
newName := filepath.ToSlash(path)
oldName := newName + ".orig"
_, err = stdout.Write(diff.Diff(oldName, input, newName, output))
_, err = stdout.Write(rpdiff.Diff(oldName, input, newName, output))
if err != nil {
return err
}
Expand Down
Loading
Loading