Skip to content

Commit 3a0ea51

Browse files
nobishinoccojocar
authored andcommittedMar 8, 2024
Refactor: use standard function to check if a file is generated
As of Go1.21, we can use https://pkg.go.dev/go/ast#IsGenerated to check if a file is generated. Probably we want to use this instead of own implementation.
1 parent 11c3252 commit 3a0ea51

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed
 

‎analyzer.go

+2-13
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ func (gosec *Analyzer) CheckRules(pkg *packages.Package) {
376376
if filepath.Ext(checkedFile) != ".go" {
377377
continue
378378
}
379-
if gosec.excludeGenerated && isGeneratedFile(file) {
379+
if gosec.excludeGenerated && ast.IsGenerated(file) {
380380
gosec.logger.Println("Ignoring generated file:", checkedFile)
381381
continue
382382
}
@@ -459,7 +459,7 @@ func (gosec *Analyzer) CheckAnalyzers(pkg *packages.Package) {
459459
func (gosec *Analyzer) generatedFiles(pkg *packages.Package) map[string]bool {
460460
generatedFiles := map[string]bool{}
461461
for _, file := range pkg.Syntax {
462-
if isGeneratedFile(file) {
462+
if ast.IsGenerated(file) {
463463
fp := pkg.Fset.File(file.Pos())
464464
if fp == nil {
465465
// skip files which cannot be located
@@ -500,17 +500,6 @@ func (gosec *Analyzer) buildSSA(pkg *packages.Package) (interface{}, error) {
500500
return ssaPass.Analyzer.Run(ssaPass)
501501
}
502502

503-
func isGeneratedFile(file *ast.File) bool {
504-
for _, comment := range file.Comments {
505-
for _, row := range comment.List {
506-
if generatedCodePattern.MatchString(row.Text) {
507-
return true
508-
}
509-
}
510-
}
511-
return false
512-
}
513-
514503
// ParseErrors parses the errors from given package
515504
func (gosec *Analyzer) ParseErrors(pkg *packages.Package) error {
516505
if len(pkg.Errors) == 0 {

0 commit comments

Comments
 (0)
Please sign in to comment.