more bracket-range tests succeed (#301)

Byron · Apr 13, 2022 · c64f71c · c64f71c
1 parent 97aa9ed
commit c64f71c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/git-glob/src/wildmatch.rs b/git-glob/src/wildmatch.rs
@@ -199,6 +199,13 @@ pub(crate) mod function {
                                     }
                                     if t_ch <= p_ch && t_ch >= prev_p_ch {
                                         matched = true;
+                                    } else if mode.contains(Mode::IGNORE_CASE) && t_ch.is_ascii_lowercase() {
+                                        let t_ch_upper = t_ch.to_ascii_uppercase();
+                                        if t_ch_upper <= p_ch.to_ascii_uppercase()
+                                            && t_ch_upper >= prev_p_ch.to_ascii_uppercase()
+                                        {
+                                            matched = true;
+                                        }
                                     }
                                     prev_p_ch = 0;
                                 }

diff --git a/git-glob/tests/wildmatch/mod.rs b/git-glob/tests/wildmatch/mod.rs
@@ -106,8 +106,8 @@ fn corpus() {
         (0,0,0,0, "q", "[a-c[:digit:]x-z]"),
 
         // Additional tests, including some malformed wild(patterns
-        (1,1,1,1, "]", "[\\-^]"),
-        (0,0,0,0, "[", "[\\-^]"),
+        (1,1,1,1, "]", r"[\\-^]"),
+        (0,0,0,0, "[", r"[\\-^]"),
         (1,1,1,1, "-", r"[\-_]"),
         (1,1,1,1, "]", r"[\]]"),
         (0,0,0,0, r"\]", r"[\]]"),
@@ -245,7 +245,7 @@ fn corpus() {
 
 #[test]
 fn empty_brackets() {
-    let (_pattern, actual) = multi_match("a[]]b", "a]b");
+    let (_pattern, actual) = multi_match(r"[A-\\]", "G");
     assert!(!actual.any_panicked());
     assert_eq!(actual, expect_multi(1, 1, 1, 1));
 }