fix: include/skip logic.

jcchavezs · Sep 21, 2023 · 4ac7c25 · 4ac7c25
1 parent 46dc46e
commit 4ac7c25
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 9 deletions.
diff --git a/cmd/porto/main.go b/cmd/porto/main.go
@@ -73,14 +73,20 @@ Add import path to a folder
 	}
 	skipDirsRegex = append(skipDirsRegex, userSkipDirsRegex...)
 
-	diffCount, err := porto.FindAndAddVanityImportForDir(workingDir, baseAbsDir, porto.Options{
-		WriteResultToFile:   *flagWriteOutputToFile,
-		ListDiffFiles:       *flagListDiff,
-		SkipFilesRegexes:    skipFilesRegex,
-		SkipDirsRegexes:     skipDirsRegex,
-		IncludeInternal:     *flagIncludeInternal,
-		IncludeFilesRegexes: includeFilesRegex,
-	})
+	opts := porto.Options{
+		WriteResultToFile: *flagWriteOutputToFile,
+		ListDiffFiles:     *flagListDiff,
+		IncludeInternal:   *flagIncludeInternal,
+	}
+
+	if len(includeFilesRegex) > 0 {
+		opts.IncludeFilesRegexes = includeFilesRegex
+	} else {
+		opts.SkipFilesRegexes = skipFilesRegex
+		opts.SkipDirsRegexes = skipDirsRegex
+	}
+
+	diffCount, err := porto.FindAndAddVanityImportForDir(workingDir, baseAbsDir, opts)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/import.go b/import.go
@@ -127,7 +127,18 @@ func findAndAddVanityImportForModuleDir(workingDir, absDir string, moduleName st
 			}
 
 			gc += c
-		} else if fileName := f.Name(); isGoFile(fileName) && !isGoTestFile(fileName) && matchesAny(opts.IncludeFilesRegexes, fileName) && !matchesAny(opts.SkipFilesRegexes, fileName) {
+		} else if fileName := f.Name(); isGoFile(fileName) && !isGoTestFile(fileName) {
+			shouldEvaluate := true
+			if len(opts.IncludeFilesRegexes) > 0 {
+				shouldEvaluate = matchesAny(opts.IncludeFilesRegexes, fileName)
+			} else if len(opts.SkipFilesRegexes) > 0 {
+				shouldEvaluate = !matchesAny(opts.SkipFilesRegexes, fileName)
+			}
+
+			if !shouldEvaluate {
+				continue
+			}
+
 			absFilepath := absDir + pathSeparator + fileName
 
 			hasChanged, newContent, err := addImportPath(absDir+pathSeparator+fileName, moduleName)

diff --git a/import_test.go b/import_test.go
@@ -72,6 +72,52 @@ func TestFindFilesWithVanityImport(t *testing.T) {
 		assert.Equal(t, 0, c)
 	})
 
+	t.Run("skip file", func(t *testing.T) {
+		c, err := findAndAddVanityImportForModuleDir(
+			cwd,
+			cwd+"/testdata/leftpad",
+			"github.com/jcchavezs/porto-integration-leftpad",
+			Options{
+				ListDiffFiles:    true,
+				SkipFilesRegexes: []*regexp.Regexp{regexp.MustCompile(`leftpad\.go`)},
+			},
+		)
+
+		require.NoError(t, err)
+		assert.Equal(t, 1, c)
+	})
+
+	t.Run("include file", func(t *testing.T) {
+		c, err := findAndAddVanityImportForModuleDir(
+			cwd,
+			cwd+"/testdata/leftpad",
+			"github.com/jcchavezs/porto-integration-leftpad",
+			Options{
+				ListDiffFiles:       true,
+				IncludeFilesRegexes: []*regexp.Regexp{regexp.MustCompile(`other\.go`)},
+			},
+		)
+
+		require.NoError(t, err)
+		assert.Equal(t, 1, c)
+	})
+
+	t.Run("skip and include file", func(t *testing.T) {
+		c, err := findAndAddVanityImportForModuleDir(
+			cwd,
+			cwd+"/testdata/leftpad",
+			"github.com/jcchavezs/porto-integration-leftpad",
+			Options{
+				ListDiffFiles:       true,
+				IncludeFilesRegexes: []*regexp.Regexp{regexp.MustCompile(`other\.go`)},
+				SkipFilesRegexes:    []*regexp.Regexp{regexp.MustCompile(`leftpad\.go`)},
+			},
+		)
+
+		require.NoError(t, err)
+		assert.Equal(t, 1, c)
+	})
+
 }
 
 func TestMatchesAny(t *testing.T) {