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

dev: remove Run.Args (#4525)

Browse Source
This commit is contained in:
Ludovic Fernandez 2024-03-18 00:36:05 +01:00 committed by GitHub
parent d37a3e0951
commit a5e2fd817e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/commands/run.go
View File

@ -369,8 +369,6 @@ func (c *runCommand) runAndPrint(ctx context.Context, args []string) error {
// runAnalysis executes the linters that have been enabled in the configuration.
func (c *runCommand) runAnalysis(ctx context.Context, args []string) ([]result.Issue, error) {
c.cfg.Run.Args = args
lintersToRun, err := c.dbManager.GetOptimizedLinters()
if err != nil {
return nil, err
@ -381,8 +379,8 @@ func (c *runCommand) runAnalysis(ctx context.Context, args []string) ([]result.I
return nil, fmt.Errorf("context loading failed: %w", err)
}
runner, err := lint.NewRunner(c.log.Child(logutils.DebugKeyRunner),
c.cfg, c.goenv, c.lineCache, c.fileCache, c.dbManager, lintCtx)
runner, err := lint.NewRunner(c.log.Child(logutils.DebugKeyRunner), c.cfg, args,
c.goenv, c.lineCache, c.fileCache, c.dbManager, lintCtx)
if err != nil {
return nil, err
}

3
pkg/config/run.go
View File

@ -33,9 +33,6 @@ type Run struct {
// Deprecated: use Output.ShowStats instead.
ShowStats bool `mapstructure:"show-stats"`
// Only used by skipDirs processor. TODO(ldez) remove it in next PR.
Args []string // Internal needs.
}
func (r *Run) Validate() error {

4
pkg/lint/runner.go
View File

@ -32,7 +32,7 @@ type Runner struct {
Processors []processors.Processor
}
func NewRunner(log logutils.Log, cfg *config.Config, goenv *goutil.Env,
func NewRunner(log logutils.Log, cfg *config.Config, args []string, goenv *goutil.Env,
lineCache *fsutils.LineCache, fileCache *fsutils.FileCache,
dbManager *lintersdb.Manager, lintCtx *linter.Context,
) (*Runner, error) {
@ -51,7 +51,7 @@ func NewRunner(log logutils.Log, cfg *config.Config, goenv *goutil.Env,
skipDirs = append(skipDirs, packages.StdExcludeDirRegexps...)
}
skipDirsProcessor, err := processors.NewSkipDirs(skipDirs, log.Child(logutils.DebugKeySkipDirs), cfg.Run.Args, cfg.Output.PathPrefix)
skipDirsProcessor, err := processors.NewSkipDirs(skipDirs, log.Child(logutils.DebugKeySkipDirs), args, cfg.Output.PathPrefix)
if err != nil {
return nil, err
}