langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix partially quoted text not handling escaped quotes

Browse Source 
https://forums.ankiweb.net/t/how-to-search-for-cards-containing-quotes/500/10
This commit is contained in:
Damien Elmes 2020-06-27 09:39:40 +10:00
parent 52bc27d7d2
commit 31a422cf85
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rslib/src/search/parser.rs
View File

@ -254,6 +254,7 @@ fn quoted_term_inner(s: &str) -> IResult<&str, &str> {
fn partially_quoted_term(s: &str) -> IResult<&str, Node> { fn partially_quoted_term(s: &str) -> IResult<&str, Node> {
let term = take_while1(|c| c != ' ' && c != ')' && c != ':'); let term = take_while1(|c| c != ' ' && c != ')' && c != ':');
let (s, (term, _, quoted_val)) = tuple((term, char(':'), quoted_term_str))(s)?; let (s, (term, _, quoted_val)) = tuple((term, char(':'), quoted_term_str))(s)?;
let quoted_val = unescape_quotes(quoted_val);
match search_node_for_text_with_argument(term.into(), quoted_val.into()) { match search_node_for_text_with_argument(term.into(), quoted_val.into()) {
Ok(search) => Ok((s, Node::Search(search))), Ok(search) => Ok((s, Node::Search(search))),
@ -475,6 +476,17 @@ mod test {
})] })]
); );
// partially quoted text should handle escaping the same way
assert_eq!(
parse(r#""field:va\"lue""#)?,
vec![Search(SingleField {
field: "field".into(),
text: "va\"lue".into(),
is_re: false
})]
);
assert_eq!(parse(r#""field:va\"lue""#)?, parse(r#"field:"va\"lue""#)?,);
// any character should be escapable in quotes // any character should be escapable in quotes
assert_eq!( assert_eq!(
parse(r#""re:\btest""#)?, parse(r#""re:\btest""#)?,