More lenient file path matchers

This commit is contained in:
Kirill Bulatov 2023-11-14 00:19:51 +02:00
parent b8be720490
commit 1612c90052
3 changed files with 24 additions and 3 deletions

View File

@ -12,7 +12,6 @@ pub struct ProjectSettings {
pub git: GitSettings,
// TODO kb better names and docs and tests
// TODO kb how to react on their changes?
// TODO kb /something/node_modules/ does not match `"**/node_modules/**"` glob!!!
#[serde(default)]
pub scan_exclude_files: Vec<String>,
}

View File

@ -3598,7 +3598,7 @@ impl BackgroundScanner {
for entry in &mut new_entries {
state.reuse_entry_id(entry);
if entry.is_dir() {
if state.should_scan_directory(&entry, &job.path.join(&entry.path)) {
if state.should_scan_directory(&entry, &root_abs_path.join(&entry.path)) {
job_ix += 1;
} else {
log::debug!("defer scanning directory {:?}", entry.path);

View File

@ -211,7 +211,19 @@ impl PathMatcher {
}
pub fn is_match<P: AsRef<Path>>(&self, other: P) -> bool {
other.as_ref().starts_with(&self.maybe_path) || self.glob.is_match(other)
other.as_ref().starts_with(&self.maybe_path)
|| self.glob.is_match(&other)
|| self.check_with_end_separator(other.as_ref())
}
fn check_with_end_separator(&self, path: &Path) -> bool {
let path_str = path.to_string_lossy();
let separator = std::path::MAIN_SEPARATOR_STR;
if path_str.ends_with(separator) {
self.glob.is_match(path)
} else {
self.glob.is_match(path_str.to_string() + separator)
}
}
}
@ -388,4 +400,14 @@ mod tests {
let path = Path::new("/a/b/c/.eslintrc.js");
assert_eq!(path.extension_or_hidden_file_name(), Some("js"));
}
#[test]
fn edge_of_glob() {
let path = Path::new("/work/node_modules");
let path_matcher = PathMatcher::new("**/node_modules/**").unwrap();
assert!(
path_matcher.is_match(&path),
"Path matcher {path_matcher} should match {path:?}"
);
}
}