fix exclude filters only working for directories

xrstf · May 3, 2021 · e51cef8 · e51cef8
1 parent bee660e
commit e51cef8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/config.go b/config.go
@@ -52,6 +52,8 @@ func loadConfiguration(filename string, moduleRoot string) (*Config, error) {
 			// to not muck with generated files
 			"**/zz_generated.**",
 			"**/zz_generated_**",
+			"**/generated.pb.go",
+			"**/*_generated.go",
 
 			// for performance
 			".git/**",

diff --git a/main.go b/main.go
@@ -168,13 +168,17 @@ func listFiles(start string, moduleRoot string, skips []string) ([]string, error
 			return err
 		}
 
-		if d.IsDir() {
-			for _, skip := range skips {
-				if match, _ := doublestar.Match(skip, relPath); match {
+		for _, skip := range skips {
+			if match, _ := doublestar.Match(skip, relPath); match {
+				if d.IsDir() {
 					return filepath.SkipDir
+				} else {
+					return nil
 				}
 			}
-		} else if strings.HasSuffix(path, ".go") {
+		}
+
+		if !d.IsDir() && strings.HasSuffix(path, ".go") {
 			result = append(result, path)
 		}