Fix ignore parsing (#36)

* Use a new .gitignore parser / batch file openings

* Update IgnoreTests.cs

* Update a.txt

Author: z4kn4fein

src/ConfigCat.Cli.Models/Git/GitRepositoryInfo.cs

@@ -4,8 +4,6 @@ namespace ConfigCat.Cli.Models.Git;
 
 public class GitRepositoryInfo
 {
-    public string WorkingDirectory { get; set; }
-
     public string Branch { get; set; }
 
     public string CurrentCommitHash { get; set; }

src/ConfigCat.Cli.Services/ConfigCat.Cli.Services.csproj

@@ -10,8 +10,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotNet.Glob" Version="3.1.3" />
+    <PackageReference Include="Ignore" Version="0.2.1" />
     <PackageReference Include="Trybot" Version="2.4.4" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="ConfigCat.Cli.Tests" />
+  </ItemGroup>
+
 </Project>

src/ConfigCat.Cli.Services/Extensions/IOExtensions.cs

@@ -8,6 +8,9 @@ namespace System.IO;
 public static class FileSystemExtensions
 {
     public static bool IsIgnoreFile(this FileInfo info) => IgnoreFile.IgnoreFileNames.Contains(info.Name);
+    
+    public static bool SameDirectory(this DirectoryInfo dir1, DirectoryInfo dir2) => 
+        Path.GetRelativePath(dir1.FullName, dir2.FullName) == ".";
 
     public static async Task<bool> IsBinaryAsync(this FileInfo file, CancellationToken token)
     {

src/ConfigCat.Cli.Services/Extensions/SystemExtensions.cs

@@ -9,7 +9,7 @@ namespace System;
 
 public static class SystemExtensions
 {
-    public static string AsSlash(this string text) => text.Replace(Path.DirectorySeparatorChar, '/');
+    public static string WithSlashes(this string text) => text.Replace(Path.DirectorySeparatorChar, '/');
 
     public static string RemoveDashes(this string text) => text.Replace("-", string.Empty).Replace("_", string.Empty);
 

src/ConfigCat.Cli.Services/FileSystem/FileCollector.cs

@@ -10,31 +10,27 @@ namespace ConfigCat.Cli.Services.FileSystem;
 
 public interface IFileCollector
 {
-    Task<IEnumerable<FileInfo>> CollectAsync(DirectoryInfo rootDirectory, CancellationToken token);
+    Task<IEnumerable<FileInfo>> CollectAsync(DirectoryInfo searchDirectory, DirectoryInfo gitRepoDir,
+        CancellationToken token);
 }
 
 public class FileCollector(IOutput output) : IFileCollector
 {
-    public async Task<IEnumerable<FileInfo>> CollectAsync(DirectoryInfo rootDirectory, CancellationToken token)
+    public async Task<IEnumerable<FileInfo>> CollectAsync(DirectoryInfo searchDirectory, DirectoryInfo gitRepoDir,
+        CancellationToken token)
     {
         using var spinner = output.CreateSpinner(token);
 
-        var files = rootDirectory.GetFiles("*", new EnumerationOptions
-        {
-            RecurseSubdirectories = true,
-            IgnoreInaccessible = true,
-            AttributesToSkip = FileAttributes.System
-        });
-        var ignoreFiles = files.Where(f => f.IsIgnoreFile()).ToArray();
-        var filesToReturn = files.Except(ignoreFiles);
-        var ignores = ignoreFiles
-            .Select(ignoreFile => new IgnoreFile(ignoreFile, rootDirectory))
-            .Cast<IgnorePolicy>()
-            .ToList();
-
-        ignores.Add(new GlobalIgnorePolicy(rootDirectory, "**/.git/**", "*.lock", "*lock.json", "*.graphql", "*.md", ".dockerignore"));
+        var (ignoreFiles, filesToReturn) = GetFilesFromWorkSpace(searchDirectory, gitRepoDir);
+        List<IgnorePolicy> policies =
+        [
+            new GlobalIgnorePolicy(gitRepoDir ?? searchDirectory, ".git", "*.lock", "*lock.json", "*.graphql", "*.md",
+                ".dockerignore")
+        ];
+        policies.AddRange(ignoreFiles
+            .Select(ignoreFile => new IgnoreFile(ignoreFile, gitRepoDir ?? searchDirectory)));
 
-        foreach (var ignore in ignores)
+        foreach (var ignore in policies)
         {
             if (ignore is not IgnoreFile ignoreFile) continue;
             output.Verbose($"Using ignore file {ignoreFile.File.FullName}");
@@ -43,7 +39,7 @@ public async Task<IEnumerable<FileInfo>> CollectAsync(DirectoryInfo rootDirector
 
         return filesToReturn.Where(f =>
         {
-            foreach (var ignore in ignores.Where(i => i.Handles(f)).OrderByDescending(i => i.Rank))
+            foreach (var ignore in policies.Where(i => i.Handles(f)).OrderByDescending(i => i.Rank))
             {
                 if (ignore.IsAccepting(f))
                     return true;
@@ -55,4 +51,35 @@ public async Task<IEnumerable<FileInfo>> CollectAsync(DirectoryInfo rootDirector
             return true;
         });
     }
+
+    internal static (IEnumerable<FileInfo> ignoreFiles, IEnumerable<FileInfo> files) GetFilesFromWorkSpace(
+        DirectoryInfo searchDirectory, DirectoryInfo gitRepoDir)
+    {
+        var allFiles = EnumerateFiles(searchDirectory, true).ToArray();
+        var ignoreFiles = allFiles.Where(f => f.IsIgnoreFile()).ToArray();
+        var otherFiles = allFiles.Except(ignoreFiles);
+        if (gitRepoDir == null || searchDirectory.SameDirectory(gitRepoDir))
+            return (ignoreFiles, otherFiles);
+
+        // We are in a git repository's subdirectory, so we walk up to
+        // the root folder and collect all .ignore files along the way.
+        var currentDir = searchDirectory;
+        do
+        {
+            currentDir = currentDir.Parent;
+            ignoreFiles = ignoreFiles.Concat(EnumerateFiles(currentDir, false).Where(f => f.IsIgnoreFile())).ToArray();
+        } while (currentDir != null && !currentDir.SameDirectory(gitRepoDir));
+
+        return (ignoreFiles, otherFiles);
+    }
+
+    private static IEnumerable<FileInfo> EnumerateFiles(DirectoryInfo directory, bool recurse) =>
+        directory == null
+            ? []
+            : directory.EnumerateFiles("*", new EnumerationOptions
+            {
+                RecurseSubdirectories = recurse,
+                IgnoreInaccessible = true,
+                AttributesToSkip = FileAttributes.System
+            });
 }

src/ConfigCat.Cli.Services/FileSystem/Ignore/GlobalIgnorePolicy.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Ignore;
 
 namespace ConfigCat.Cli.Services.FileSystem.Ignore;
 
@@ -9,16 +10,13 @@ internal class GlobalIgnorePolicy : IgnorePolicy
 
     public GlobalIgnorePolicy(DirectoryInfo rootDirectory, params string[] patterns)
     {
-        foreach (var pattern in patterns)
-            base.IgnoreMatcher.Add(pattern);
-
         this.rootDirectory = rootDirectory;
+        foreach (var pattern in patterns)
+            base.DenyRules.Add(new IgnoreRule(pattern));
     }
 
-    public override bool IsAccepting(FileInfo file) => base.IsAcceptingInternal(file.FullName.Replace(this.rootDirectory.FullName, string.Empty));
-
-    public override bool IsIgnoring(FileInfo file) => base.IsIgnoringInternal(file.FullName.Replace(this.rootDirectory.FullName, string.Empty));
+    public override bool Handles(FileInfo file) => true;
 
-    public override bool Handles(FileInfo file) =>
-        file.DirectoryName.AsSlash().Contains(this.rootDirectory.FullName.AsSlash().TrimEnd('/'));
+    protected override string PreProcessFilePath(FileInfo file) =>
+        Path.GetRelativePath(this.rootDirectory.FullName, file.FullName).WithSlashes();
 }

src/ConfigCat.Cli.Services/FileSystem/Ignore/IgnoreFile.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Ignore;
 
 namespace ConfigCat.Cli.Services.FileSystem.Ignore;
 
@@ -24,12 +25,11 @@ public async Task LoadIgnoreFileAsync(CancellationToken token)
         this.ProcessPatterns(lines);
     }
 
-    public override bool IsAccepting(FileInfo file) => base.IsAcceptingInternal(file.FullName.Replace(this.File.DirectoryName, string.Empty));
-
-    public override bool IsIgnoring(FileInfo file) => base.IsIgnoringInternal(file.FullName.Replace(this.File.DirectoryName, string.Empty));
-
     public override bool Handles(FileInfo file) =>
-        file.DirectoryName.AsSlash().Contains(this.File.DirectoryName.AsSlash().TrimEnd('/'));
+        file.DirectoryName.WithSlashes().Contains(this.File.DirectoryName.WithSlashes().TrimEnd('/'));
+
+    protected override string PreProcessFilePath(FileInfo file) =>
+        Path.GetRelativePath(this.File.DirectoryName, file.FullName).WithSlashes();
 
     private void ProcessPatterns(string[] patterns)
     {
@@ -41,15 +41,15 @@ private void ProcessPatterns(string[] patterns)
 
             if (current.StartsWith('!'))
             {
-                current = current.Substring(1);
-                base.AcceptMatcher.Add(current);
+                current = current[1..];
+                base.AcceptRules.Add(new IgnoreRule(current));
                 continue;
             }
 
             if (pattern.StartsWith(@"\#") || pattern.StartsWith(@"\!"))
-                current = current.Substring(1);
+                current = current[1..];
 
-            base.IgnoreMatcher.Add(current);
+            base.DenyRules.Add(new IgnoreRule(current));
         }
     }
 }

src/ConfigCat.Cli.Services/FileSystem/Ignore/IgnorePolicy.cs

@@ -1,22 +1,23 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using Ignore;
 
 namespace ConfigCat.Cli.Services.FileSystem.Ignore;
 
 internal abstract class IgnorePolicy
 {
-    protected readonly IgnoreRuleSet AcceptMatcher = new();
-    protected readonly IgnoreRuleSet IgnoreMatcher = new();
+    protected readonly List<IgnoreRule> AcceptRules = [];
+    protected readonly List<IgnoreRule> DenyRules = [];
 
-    public abstract bool IsAccepting(FileInfo file);
+    public bool IsAccepting(FileInfo file) => AcceptRules.Any(rule => rule.IsMatch(PreProcessFilePath(file)));
 
-    public abstract bool IsIgnoring(FileInfo file);
+    public bool IsIgnoring(FileInfo file) => DenyRules.Any(rule => rule.IsMatch(PreProcessFilePath(file)));
 
     public abstract bool Handles(FileInfo file);
+    
+    protected abstract string PreProcessFilePath(FileInfo file);
 
-    public int Rank { get; protected set; }
-
-    protected bool IsAcceptingInternal(string filePath) => this.AcceptMatcher.HasMatch(filePath.AsSlash().AsSpan());
-
-    protected bool IsIgnoringInternal(string filePath) => this.IgnoreMatcher.HasMatch(filePath.AsSlash().AsSpan());
+    public int Rank { get; protected init; }
 }