make bracket matching work better (#301)

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

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/git-glob/src/wildmatch.rs b/git-glob/src/wildmatch.rs
@@ -176,7 +176,6 @@ pub(crate) mod function {
                         match next {
                             None => return AbortAll,
                             Some((_p_idx, mut p_ch)) => match p_ch {
-                                BRACKET_CLOSE => break,
                                 BACKSLASH => match p.next() {
                                     Some((_, p_ch)) => {
                                         if p_ch == t_ch {
@@ -213,11 +212,14 @@ pub(crate) mod function {
                             },
                         };
                         next = p.next();
+                        if let Some((_, BRACKET_CLOSE)) = next {
+                            break;
+                        }
                     }
                     if matched == negated || mode.contains(Mode::SLASH_IS_LITERAL) && t_ch == SLASH {
                         return NoMatch;
                     }
-                    todo!("bracket support post loop");
+                    continue;
                 }
                 non_glob_ch => {
                     if non_glob_ch != t_ch {

diff --git a/git-glob/tests/wildmatch/mod.rs b/git-glob/tests/wildmatch/mod.rs
@@ -244,8 +244,8 @@ fn corpus() {
 }
 
 #[test]
-fn simple_double_star() {
-    let (_pattern, actual) = multi_match("test/**", "test/one/two");
+fn empty_brackets() {
+    let (_pattern, actual) = multi_match("a[]]b", "a]b");
     assert!(!actual.any_panicked());
     assert_eq!(actual, expect_multi(1, 1, 1, 1));
 }