fix: diff hidden but non-ignored files when walking directories

Wilfred · Apr 1, 2024 · 573d607 · 573d607
1 parent 1f79d16
commit 573d607
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/files.rs b/src/files.rs
@@ -7,7 +7,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use ignore::Walk;
+use ignore::WalkBuilder;
 use rustc_hash::FxHashSet;
 
 use crate::exit_codes::EXIT_BAD_ARGUMENTS;
@@ -228,7 +228,9 @@ pub(crate) fn guess_content(bytes: &[u8]) -> ProbableFileKind {
 
 /// All the files in `dir`, including subdirectories.
 fn relative_file_paths_in_dir(dir: &Path) -> Vec<PathBuf> {
-    Walk::new(dir)
+    WalkBuilder::new(dir)
+        .hidden(false)
+        .build()
         .filter_map(Result::ok)
         .map(|entry| Path::new(entry.path()).to_owned())
         .filter(|path| !path.is_dir())

diff --git a/tests/cli.rs b/tests/cli.rs
@@ -253,9 +253,10 @@ fn walk_hidden_items() {
 
     cmd.args(["sample_files/hidden-before", "sample_files/hidden-after"]);
 
-    let predicate_fn = predicate::str::contains(".hidden/doc.txt")
-        .and(predicate::str::contains(".hidden.txt"))
-        .and(predicate::str::contains("before"))
-        .and(predicate::str::contains("after"));
+    let predicate_fn =
+        predicate::str::contains(format!(".hidden{}doc.txt", std::path::MAIN_SEPARATOR))
+            .and(predicate::str::contains(".hidden.txt"))
+            .and(predicate::str::contains("before"))
+            .and(predicate::str::contains("after"));
     cmd.assert().stdout(predicate_fn);
 }