From e1ec8c5a6f1519c5757e352f6a196046d96e74c7 Mon Sep 17 00:00:00 2001 From: Alexander Chuprov Date: Mon, 31 Mar 2025 12:07:22 +0300 Subject: [PATCH] [#30] noliteral: Simplify code Signed-off-by: Alexander Chuprov --- internal/analyzers/noliteral/linter.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/analyzers/noliteral/linter.go b/internal/analyzers/noliteral/linter.go index 3b0951a..26fb97f 100644 --- a/internal/analyzers/noliteral/linter.go +++ b/internal/analyzers/noliteral/linter.go @@ -3,6 +3,7 @@ package noliteral import ( "go/ast" "go/token" + "slices" astutils "git.frostfs.info/TrueCloudLab/linters/pkg/ast-utils" "github.com/mitchellh/mapstructure" @@ -85,16 +86,11 @@ func (l *noliteral) analyzeCallExpr(pass *analysis.Pass, expr *ast.CallExpr, fil if !astutils.IsStringValue(expr.Args[0]) { alias, _ := astutils.GetAliasByPkgName(file, l.config.ConstantsPackage) - if l.config.ConstantsPackage == "" || astutils.GetPackageName(expr.Args[0]) == alias || astutils.GetPackageName(expr.Args[0]) == "" { + pkgName := astutils.GetPackageName(expr.Args[0]) + if l.config.ConstantsPackage == "" || pkgName == alias || pkgName == "" || slices.Contains(l.config.DisablePackages, pkgName) { return false } - for _, pkgName := range l.config.DisablePackages { - if pkgName == astutils.GetPackageName(expr.Args[0]) { - return false - } - } - pass.Report(analysis.Diagnostic{ Pos: expr.Pos(), End: expr.End(),