Skip to content

Commit 3aede8c

Browse files
committed
chore: use Go version
1 parent b512c36 commit 3aede8c

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

pkg/config/linters_settings.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,9 @@ type ReassignSettings struct {
791791
}
792792

793793
type ReviveSettings struct {
794-
MaxOpenFiles int `mapstructure:"max-open-files"`
795-
IgnoreGeneratedHeader bool `mapstructure:"ignore-generated-header"`
794+
Go string `mapstructure:"-"`
795+
MaxOpenFiles int `mapstructure:"max-open-files"`
796+
IgnoreGeneratedHeader bool `mapstructure:"ignore-generated-header"`
796797
Confidence float64
797798
Severity string
798799
EnableAllRules bool `mapstructure:"enable-all-rules"`

pkg/config/loader.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ func (l *Loader) handleGoVersion() {
292292

293293
trimmedGoVersion := trimGoVersion(l.cfg.Run.Go)
294294

295+
l.cfg.LintersSettings.Revive.Go = trimmedGoVersion
296+
295297
l.cfg.LintersSettings.Gocritic.Go = trimmedGoVersion
296298

297299
// staticcheck related linters.

pkg/golinters/revive/revive.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"sync"
1111

1212
"github.com/BurntSushi/toml"
13+
hcversion "github.com/hashicorp/go-version"
1314
reviveConfig "github.com/mgechev/revive/config"
1415
"github.com/mgechev/revive/lint"
1516
"github.com/mgechev/revive/rule"
@@ -89,6 +90,11 @@ func newWrapper(settings *config.ReviveSettings) (*wrapper, error) {
8990
return nil, err
9091
}
9192

93+
conf.GoVersion, err = hcversion.NewVersion(settings.Go)
94+
if err != nil {
95+
return nil, err
96+
}
97+
9298
formatter, err := reviveConfig.GetFormatter("json")
9399
if err != nil {
94100
return nil, err

0 commit comments

Comments
 (0)