1. Update version after type fixes

2. Added tests in subdir
golangci · Nov 15, 2023 · bf7fb06 · bf7fb06
1 parent 70cd3e5
commit bf7fb06
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/pkg/golinters/gofactorylint.go b/pkg/golinters/gofactorylint.go
@@ -9,22 +9,22 @@ import (
 )
 
 func NewGoFactoryLint(settings *config.GoFactoryLintSettings) *goanalysis.Linter {
- a := factory.NewAnalyzer()
+ analyzer := factory.NewAnalyzer()
 
  cfg := make(map[string]map[string]any)
  if settings != nil {
- cfg[a.Name] = map[string]any{}
+ cfg[analyzer.Name] = map[string]any{}
 
  if len(settings.BlockedPkgs) > 0 {
- cfg[a.Name]["blockedPkgs"] = settings.BlockedPkgs
- cfg[a.Name]["onlyBlockedPkgs"] = settings.OnlyBlockedPkgs
+ cfg[analyzer.Name]["blockedPkgs"] = settings.BlockedPkgs
+ cfg[analyzer.Name]["onlyBlockedPkgs"] = settings.OnlyBlockedPkgs
  }
  }
 
  return goanalysis.NewLinter(
- a.Name,
- a.Doc,
- []*analysis.Analyzer{a},
+ analyzer.Name,
+ analyzer.Doc,
+ []*analysis.Analyzer{analyzer},
  cfg,
  ).WithLoadMode(goanalysis.LoadModeTypesInfo)
 }
diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go
@@ -493,6 +493,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
  linter.NewConfig(golinters.NewGoFactoryLint(goFactoryCfg)).
  WithSince("next_version").
  WithPresets(linter.PresetStyle).
+ WithLoadForGoAnalysis().
  WithURL("https://github.com/maranqz/go-factory-lint"),
 
  linter.NewConfig(golinters.NewGofmt(gofmtCfg)).

diff --git a/test/linters_test.go b/test/linters_test.go
@@ -33,6 +33,7 @@ func TestSourcesFromTestdataSubDir(t *testing.T) {
  "ginkgolinter",
  "zerologlint",
  "protogetter",
+ "gofactory",
  }
 
  for _, dir := range subDirs {

diff --git a/test/testdata/gofactory/app.go b/test/testdata/gofactory/app.go
@@ -1,3 +1,5 @@
+//golangcitest:args -Egofactory
+
 package gofactory
 
 import "github.com/golangci/golangci-lint/test/testdata/gofactory/nested"