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

Fix missing hyphen escape when normalizing search (#1233)

Browse Source 
* Fix missing hyphen escape when normalizing search

* Add some more tests for normalization

* Use char to satisfy clippy
This commit is contained in:
RumovZ 2021-06-15 02:02:39 +02:00 committed by GitHub
parent 066a2e8e1d
commit d7340d3f07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rslib/src/search/writer.rs
View File

@ -109,13 +109,17 @@ fn write_search_node(node: &SearchNode) -> String {
/// Escape double quotes and wrap in double quotes if necessary. /// Escape double quotes and wrap in double quotes if necessary.
fn maybe_quote(txt: &str) -> String { fn maybe_quote(txt: &str) -> String {
if txt.chars().any(|c| " \u{3000}()".contains(c)) { if needs_quotation(txt) {
format!("\"{}\"", txt.replace("\"", "\\\"")) format!("\"{}\"", txt.replace("\"", "\\\""))
} else { } else {
txt.replace("\"", "\\\"") txt.replace("\"", "\\\"")
} }
} }
fn needs_quotation(txt: &str) -> bool {
txt.len() > 1 && txt.starts_with('-') || txt.chars().any(|c| " \u{3000}()".contains(c))
}
fn write_single_field(field: &str, text: &str, is_re: bool) -> String { fn write_single_field(field: &str, text: &str, is_re: bool) -> String {
let re = if is_re { "re:" } else { "" }; let re = if is_re { "re:" } else { "" };
let text = if !is_re && text.starts_with("re:") { let text = if !is_re && text.starts_with("re:") {
@ -199,14 +203,24 @@ mod test {
#[test] #[test]
fn normalizing() { fn normalizing() {
// remove redundant quotes
assert_eq!( assert_eq!(
r#"foo "b a r""#, r#"foo "b a r""#,
normalize_search(r#""foo" "b a r""#).unwrap() normalize_search(r#""foo" "b a r""#).unwrap()
); );
assert_eq!(r#""(" -"#, normalize_search(r"\( \-").unwrap());
assert_eq!("deck::", normalize_search(r"deck:\:").unwrap());
assert_eq!(r"\* OR \:", normalize_search(r"\* or \:").unwrap());
assert_eq!("field:foo", normalize_search(r#"field:"foo""#).unwrap()); assert_eq!("field:foo", normalize_search(r#"field:"foo""#).unwrap());
// escape by quoting where possible
assert_eq!(r#""(" ")""#, normalize_search(r"\( \)").unwrap());
assert_eq!(r#""-foo""#, normalize_search(r"\-foo").unwrap());
assert_eq!(r"\*\:\_", normalize_search(r"\*\:\_").unwrap());
// remove redundant escapes
assert_eq!("deck::", normalize_search(r"deck:\:").unwrap());
assert_eq!("-", normalize_search(r"\-").unwrap());
assert_eq!("--", normalize_search(r"-\-").unwrap());
// ANDs are implicit, ORs in upper case
assert_eq!("1 2 OR 3", normalize_search(r"1 and 2 or 3").unwrap());
assert_eq!(r#""f o o" bar"#, normalize_search(r#""f o o"bar"#).unwrap());
// normalize numbers
assert_eq!("prop:ease>1", normalize_search("prop:ease>1.0").unwrap()); assert_eq!("prop:ease>1", normalize_search("prop:ease>1.0").unwrap());
} }