+ BeforePatterns and AfterPatterns support.

matcher.go

@@ -34,7 +34,17 @@ func (m *Matcher) Matches(basedir string, options *MatchesOptions) (*MatchesResu
 	// Init all files state
 	rootMap.mergeFiles(files, false)
 
-	// Apply  ignorefile pattern
+	// Apply before patterns
+	beforePatterns, err := makePatterns(options.BeforePatterns)
+	if err != nil {
+		return nil, err
+	}
+	err = rootMap.applyPatterns(vfs, files, beforePatterns)
+	if err != nil {
+		return nil, err
+	}
+
+	// Apply ignorefile patterns
 	ierrFiles, err := rootMap.applyIgnorefile(vfs, ignorefile, options.Nested)
 	if err != nil {
 		return nil, err
@@ -43,6 +53,16 @@ func (m *Matcher) Matches(basedir string, options *MatchesOptions) (*MatchesResu
 		errorFiles = append(errorFiles, efile)
 	}
 
+	// Apply after patterns
+	afterPatterns, err := makePatterns(options.AfterPatterns)
+	if err != nil {
+		return nil, err
+	}
+	err = rootMap.applyPatterns(vfs, files, afterPatterns)
+	if err != nil {
+		return nil, err
+	}
+
 	return makeResult(vfs, basedir, rootMap, errorFiles)
 }
 

matcher_test.go

@@ -21,6 +21,38 @@ func TestMatches_Simple(t *testing.T) {
 	require.Empty(t, result.ErrorDirs)
 }
 
+func TestMatches_Simple_WithBeforePatterns(t *testing.T) {
+	matcher := NewSystemMatcher()
+	result, err := matcher.Matches("testdata/simple", &MatchesOptions{
+		Ignorefile:     ".xignore",
+		BeforePatterns: []string{"rain.txt"},
+	})
+	require.NoError(t, err)
+
+	require.Equal(t, result.MatchedFiles, []string{".xignore", "empty.log", "rain.txt"})
+	require.Equal(t, result.UnmatchedFiles, []string{})
+	require.Empty(t, result.ErrorFiles)
+	require.Empty(t, result.MatchedDirs)
+	require.Empty(t, result.UnmatchedDirs)
+	require.Empty(t, result.ErrorDirs)
+}
+
+func TestMatches_Simple_WithAfterPatterns(t *testing.T) {
+	matcher := NewSystemMatcher()
+	result, err := matcher.Matches("testdata/simple", &MatchesOptions{
+		Ignorefile:    ".xignore",
+		AfterPatterns: []string{"!.xignore", "!empty.log", "rain.txt"},
+	})
+	require.NoError(t, err)
+
+	require.Equal(t, result.MatchedFiles, []string{"rain.txt"})
+	require.Equal(t, result.UnmatchedFiles, []string{".xignore", "empty.log"})
+	require.Empty(t, result.ErrorFiles)
+	require.Empty(t, result.MatchedDirs)
+	require.Empty(t, result.UnmatchedDirs)
+	require.Empty(t, result.ErrorDirs)
+}
+
 func TestMatches_Folder(t *testing.T) {
 	matcher := NewSystemMatcher()
 	result, err := matcher.Matches("testdata/folder", &MatchesOptions{

pattern.go

@@ -208,3 +208,19 @@ func loadPatterns(vfs afero.Fs, ignorefile string) ([]*Pattern, error) {
 
 	return patterns, nil
 }
+
+func makePatterns(strPatterns []string) ([]*Pattern, error) {
+	if strPatterns == nil || len(strPatterns) == 0 {
+		return []*Pattern{}, nil
+	}
+
+	patterns := make([]*Pattern, len(strPatterns))
+	for i, sp := range strPatterns {
+		pattern := NewPattern(sp)
+		if err := pattern.Prepare(); err != nil {
+			return nil, err
+		}
+		patterns[i] = pattern
+	}
+	return patterns, nil
+}

xignore.go

@@ -6,6 +6,10 @@ type MatchesOptions struct {
 	Ignorefile string
 	// Allow nested ignorefile
 	Nested bool
+	// apply patterns before all ignorefile
+	BeforePatterns []string
+	// apply patterns after all ignorefile
+	AfterPatterns []string
 }
 
 // MatchesResult matches result