GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-23 16:26:40 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

add w: shortcut for searching on word boundaries

Browse source
This commit is contained in:
Damien Elmes 2020-04-25 08:48:01 +10:00
parent 9dcbb8958d
commit fd844a0d5a
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rslib/src/search/parser.rs
View file

@ -277,6 +277,7 @@ fn search_node_for_text_with_argument<'a>(
"prop" => parse_prop(val.as_ref())?, "prop" => parse_prop(val.as_ref())?,
"re" => SearchNode::Regex(val), "re" => SearchNode::Regex(val),
"nc" => SearchNode::NoCombining(val), "nc" => SearchNode::NoCombining(val),
"w" => parse_word(val.as_ref()),
// anything else is a field search // anything else is a field search
_ => parse_single_field(key.as_ref(), val.as_ref()), _ => parse_single_field(key.as_ref(), val.as_ref()),
}) })
@ -409,6 +410,13 @@ fn parse_single_field(key: &str, mut val: &str) -> SearchNode<'static> {
} }
} }
fn parse_word(val: &str) -> SearchNode<'static> {
let front_boundary = if val.starts_with('*') { "" } else { r"\b" };
let end_boundary = if val.ends_with('*') { "" } else { r"\b" };
let escaped = regex::escape(val.trim_matches('*'));
SearchNode::Regex(format!("{}{}{}", front_boundary, escaped, end_boundary).into())
}
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;
@ -523,6 +531,11 @@ mod test {
})] })]
); );
assert_eq!(parse("w:foo")?, vec![Search(Regex(r"\bfoo\b".into()))]);
assert_eq!(parse("w:*foo")?, vec![Search(Regex(r"foo\b".into()))]);
assert_eq!(parse("w:foo*")?, vec![Search(Regex(r"\bfoo".into()))]);
assert_eq!(parse("w:*fo.*o*")?, vec![Search(Regex(r"fo\.\*o".into()))]);
Ok(()) Ok(())
} }
} }