depguard: reduce requirements (#2672)

golangci · Mar 21, 2022 · 8f7f44d · 8f7f44d
1 parent f055441
commit 8f7f44d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/pkg/golinters/depguard.go b/pkg/golinters/depguard.go
@@ -51,7 +51,7 @@ func NewDepguard() *goanalysis.Linter {
 		}
 	}).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue {
 		return resIssues
-	}).WithLoadMode(goanalysis.LoadModeTypesInfo)
+	}).WithLoadMode(goanalysis.LoadModeSyntax)
 }
 
 type depGuard struct {

diff --git a/pkg/golinters/goanalysis/adapters.go b/pkg/golinters/goanalysis/adapters.go
@@ -8,6 +8,11 @@ import (
 )
 
 func MakeFakeLoaderProgram(pass *analysis.Pass) *loader.Program {
+	var info types.Info
+	if pass.TypesInfo != nil {
+		info = *pass.TypesInfo
+	}
+
 	prog := &loader.Program{
 		Fset: pass.Fset,
 		Created: []*loader.PackageInfo{
@@ -18,7 +23,7 @@ func MakeFakeLoaderProgram(pass *analysis.Pass) *loader.Program {
 
 				Files:  pass.Files,
 				Errors: nil,
-				Info:   *pass.TypesInfo,
+				Info:   info,
 			},
 		},
 		AllPackages: map[*types.Package]*loader.PackageInfo{
@@ -28,7 +33,7 @@ func MakeFakeLoaderProgram(pass *analysis.Pass) *loader.Program {
 				TransitivelyErrorFree: true,
 				Files:                 pass.Files,
 				Errors:                nil,
-				Info:                  *pass.TypesInfo,
+				Info:                  info,
 			},
 		},
 	}

diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go
@@ -219,7 +219,6 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 
 		linter.NewConfig(golinters.NewDepguard()).
 			WithSince("v1.4.0").
-			WithLoadForGoAnalysis().
 			WithPresets(linter.PresetStyle, linter.PresetImport, linter.PresetModule).
 			WithURL("https://github.com/OpenPeeDeeP/depguard"),