GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 06:52:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

don't require wildcard for unicode case folding in search

Browse source
This commit is contained in:
Damien Elmes 2020-03-21 12:44:56 +10:00
parent 4ff17d31b3
commit 08e64d246d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rslib/src/text.rs
View file

@ -5,6 +5,7 @@ use lazy_static::lazy_static;
use regex::{Captures, Regex}; use regex::{Captures, Regex};
use std::borrow::Cow; use std::borrow::Cow;
use std::ptr; use std::ptr;
use unicase::eq as uni_eq;
use unicode_normalization::{is_nfc, UnicodeNormalization}; use unicode_normalization::{is_nfc, UnicodeNormalization};
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
@ -219,14 +220,14 @@ pub(crate) fn normalize_to_nfc(s: &str) -> Cow<str> {
} }
} }
/// True if search is equal to text, folding ascii case. /// True if search is equal to text, folding case.
/// Supports '*' to match 0 or more characters. /// Supports '*' to match 0 or more characters.
pub(crate) fn matches_wildcard(text: &str, search: &str) -> bool { pub(crate) fn matches_wildcard(text: &str, search: &str) -> bool {
if search.contains('*') { if search.contains('*') {
let search = format!("^(?i){}$", regex::escape(search).replace(r"\*", ".*")); let search = format!("^(?i){}$", regex::escape(search).replace(r"\*", ".*"));
Regex::new(&search).unwrap().is_match(text) Regex::new(&search).unwrap().is_match(text)
} else { } else {
text.eq_ignore_ascii_case(search) uni_eq(text, search)
} }
} }