Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-06-26 10:42:35 +00:00
Code Issues Projects Releases Wiki Activity

Ignore comments and blank lines when ignoring

Browse Source
This commit is contained in:
Benjamin Sago 2017-09-28 18:48:56 +01:00
parent 7b5b02d9f1
commit 108dc80944
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/fs/feature/ignore.rs
View File

@ -69,7 +69,11 @@ impl IgnoreCache {
fn file_lines_to_patterns<'a, I>(iter: I) -> IgnorePatterns fn file_lines_to_patterns<'a, I>(iter: I) -> IgnorePatterns
where I: Iterator<Item=&'a str> { where I: Iterator<Item=&'a str>
{
let iter = iter.filter(|el| !el.is_empty());
let iter = iter.filter(|el| !el.starts_with("#"));
// Errors are currently being ignored... not a good look // Errors are currently being ignored... not a good look
IgnorePatterns::parse_from_iter(iter).0 IgnorePatterns::parse_from_iter(iter).0
} }
@ -89,13 +93,32 @@ mod test {
#[test] #[test]
fn parse_some_globs() { fn parse_some_globs() {
let stuff = vec![ "*.mp3", "README.md" ]; let stuff = vec![ "*.mp3", "README.md" ];
let (patterns, _) = IgnorePatterns::parse_from_iter(stuff.iter().cloned()); let reals = vec![ "*.mp3", "README.md" ];
let (patterns, _) = IgnorePatterns::parse_from_iter(reals.into_iter());
assert_eq!(patterns, file_lines_to_patterns(stuff.into_iter()));
}
#[test]
fn parse_some_comments() {
let stuff = vec![ "*.mp3", "# I am a comment!", "#", "README.md" ];
let reals = vec![ "*.mp3", "README.md" ];
let (patterns, _) = IgnorePatterns::parse_from_iter(reals.into_iter());
assert_eq!(patterns, file_lines_to_patterns(stuff.into_iter()));
}
#[test]
fn parse_some_blank_lines() {
let stuff = vec![ "*.mp3", "", "", "README.md" ];
let reals = vec![ "*.mp3", "README.md" ];
let (patterns, _) = IgnorePatterns::parse_from_iter(reals.into_iter());
assert_eq!(patterns, file_lines_to_patterns(stuff.into_iter())); assert_eq!(patterns, file_lines_to_patterns(stuff.into_iter()));
} }
#[test] #[test]
fn empty() { fn an_empty_cache_ignores_nothing() {
let ignores = IgnoreCache::default(); let ignores = IgnoreCache::default();
assert_eq!(false, ignores.is_ignored(Path::new("/usr/bin/drinking"))); assert_eq!(false, ignores.is_ignored(Path::new("/usr/bin/drinking")));
assert_eq!(false, ignores.is_ignored(Path::new("target/debug/exa"))); assert_eq!(false, ignores.is_ignored(Path::new("target/debug/exa")));