Replace an ASCII space check with a is_whitespace check in Atom::new

helix-editor · Dec 9, 2024 · 1a9e169 · 1a9e169
1 parent 387b17c
commit 1a9e169
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/matcher/src/pattern.rs b/matcher/src/pattern.rs
@@ -171,8 +171,8 @@ impl Atom {
                 let mut saw_backslash = false;
                 for mut c in chars::graphemes(needle) {
                     if saw_backslash {
-                        if c == ' ' {
-                            needle_.push(' ');
+                        if c.is_whitespace() {
+                            needle_.push(c);
                             saw_backslash = false;
                             continue;
                         } else {
@@ -196,7 +196,9 @@ impl Atom {
                         }
                         Normalization::Never => (),
                     }
-                    needle_.push(c);
+                    if !saw_backslash {
+                        needle_.push(c);
+                    }
                 }
             } else {
                 let chars = chars::graphemes(needle).map(|mut c| {

diff --git a/matcher/src/pattern/tests.rs b/matcher/src/pattern/tests.rs
@@ -87,6 +87,11 @@ fn case_matching() {
 fn escape() {
     let pat = Atom::parse("foo\\ bar", CaseMatching::Smart, Normalization::Smart);
     assert_eq!(pat.needle.to_string(), "foo bar");
+    let pat = Atom::parse("foö\\ bar", CaseMatching::Smart, Normalization::Smart);
+    assert_eq!(pat.needle.to_string(), "foö bar");
+    // escaped double-width IDEOGRAPHIC SPACE
+    let pat = Atom::parse("foo\\　bar", CaseMatching::Smart, Normalization::Smart);
+    assert_eq!(pat.needle.to_string(), "foo　bar");
     let pat = Atom::parse("\\!foo", CaseMatching::Smart, Normalization::Smart);
     assert_eq!(pat.needle.to_string(), "!foo");
     assert_eq!(pat.kind, AtomKind::Fuzzy);