Support for 'ends_with' matching mode (#301)

Author: Byron

git-attributes/src/ignore.rs

@@ -5,7 +5,7 @@ pub mod pattern {
         pub struct Mode: u32 {
             /// The pattern does not contain a sub-directory and - it doesn't contain slashes after removing the trailing one.
             const NO_SUB_DIR = 1 << 0;
-            // TODO: find a much better name!
+            /// A pattern that is '*literal', meaning that it ends with what's given here
             const ENDS_WITH = 1 << 1;
             /// The pattern must match a directory, and not a file.
             const MUST_BE_DIR = 1 << 2;

git-attributes/src/parse/ignore.rs

@@ -24,7 +24,7 @@ impl<'a> Iterator for Iter<'a> {
         }
         let mut lines = self.cursor.lines_with_terminator();
         let mut res = None;
-        let mut offset = 0;
+        let mut offset = 0; // TODO: prefer `lines()` with `into_bytes()` instead.
         for mut line in lines.by_ref() {
             self.line_no += 1;
             offset += line.len();
@@ -52,6 +52,9 @@ impl<'a> Iterator for Iter<'a> {
             if !line.contains(&b'/') {
                 mode |= ignore::pattern::Mode::NO_SUB_DIR;
             }
+            if line.first() == Some(&b'*') && line[1..].find_byteset(br"*?[\").is_none() {
+                mode |= ignore::pattern::Mode::ENDS_WITH;
+            }
             res = Some((line, mode, self.line_no));
             break;
         }

git-attributes/tests/attributes.rs

@@ -11,7 +11,7 @@ mod parse {
                 actual,
                 vec![
                     ("*.[oa]".into(), Mode::NO_SUB_DIR, 2),
-                    ("*.html".into(), Mode::NO_SUB_DIR, 5),
+                    ("*.html".into(), Mode::NO_SUB_DIR | Mode::ENDS_WITH, 5),
                     ("foo.html".into(), Mode::NO_SUB_DIR | Mode::NEGATIVE, 8),
                     ("/*".into(), Mode::empty(), 11),
                     ("/foo".into(), Mode::NEGATIVE, 12),
@@ -33,6 +33,32 @@ mod parse {
             );
         }
 
+        #[test]
+        fn mark_ends_with_pattern_specifically() {
+            assert_eq!(
+                git_attributes::parse::ignore(br"*literal").next(),
+                Some((r"*literal".into(), Mode::NO_SUB_DIR | Mode::ENDS_WITH, 1))
+            );
+            assert_eq!(
+                git_attributes::parse::ignore(br"**literal").next(),
+                Some((r"**literal".into(), Mode::NO_SUB_DIR, 1)),
+                "double-asterisk won't allow for fast comparisons"
+            );
+            assert_eq!(
+                git_attributes::parse::ignore(br"*litera[l]").next(),
+                Some((r"*litera[l]".into(), Mode::NO_SUB_DIR, 1))
+            );
+            assert_eq!(
+                git_attributes::parse::ignore(br"*litera?").next(),
+                Some((r"*litera?".into(), Mode::NO_SUB_DIR, 1))
+            );
+            assert_eq!(
+                git_attributes::parse::ignore(br"*litera\?").next(),
+                Some((r"*litera\?".into(), Mode::NO_SUB_DIR, 1)),
+                "for now we don't handle escapes properly like git seems to do"
+            );
+        }
+
         #[test]
         fn comments_are_ignored() {
             assert!(git_attributes::parse::ignore(b"# hello world").next().is_none());