fix(cli): use matched_path_or_any_parents when checking if a file i…

…s ignored (tauri-apps#8903) * fix: taurignore ignoreing folders not working for watch * docs: add to changes * fix: panic: path is expected to be under the root * Update taurignore-ignoring-folders-not-working-for-watch.md * Update taurignore-ignoring-folders-not-working-for-watch.md
anatawa12 · Mar 6, 2024 · b15948b · b15948b
1 parent 5163861
commit b15948b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.changes/taurignore-ignoring-folders-not-working-for-watch.md b/.changes/taurignore-ignoring-folders-not-working-for-watch.md
@@ -0,0 +1,6 @@
+---
+'tauri-cli': patch:bug
+'@tauri-apps/cli': patch:bug
+---
+
+Fix `.taurignore` failing to ignore in some cases.
diff --git a/tooling/cli/src/interface/rust.rs b/tooling/cli/src/interface/rust.rs
@@ -263,7 +263,11 @@ struct IgnoreMatcher(Vec<Gitignore>);
 impl IgnoreMatcher {
   fn is_ignore(&self, path: &Path, is_dir: bool) -> bool {
     for gitignore in &self.0 {
-      if gitignore.matched(path, is_dir).is_ignore() {
+      if path.starts_with(gitignore.path())
+        && gitignore
+          .matched_path_or_any_parents(path, is_dir)
+          .is_ignore()
+      {
         return true;
       }
     }