From af33d22f2582f4ef40e9280100f8b72db6514daa Mon Sep 17 00:00:00 2001 From: Samyak S Sarnayak Date: Thu, 20 Oct 2022 19:02:08 +0530 Subject: [PATCH] Consecutive is false when at least 1 stop word is surrounded by words --- milli/src/search/criteria/proximity.rs | 29 +++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/milli/src/search/criteria/proximity.rs b/milli/src/search/criteria/proximity.rs index 5aa3cc8b3..5f414d84c 100644 --- a/milli/src/search/criteria/proximity.rs +++ b/milli/src/search/criteria/proximity.rs @@ -478,14 +478,29 @@ fn resolve_plane_sweep_candidates( } Phrase(words) => { let mut groups_positions = Vec::with_capacity(words.len()); - for word in words.iter().filter_map(|w| w.as_ref()) { - let positions = match words_positions.get(word) { - Some(positions) => positions.iter().map(|p| (p, 0, p)).collect(), - None => return Ok(vec![]), - }; - groups_positions.push(positions); + let mut consecutive = true; + let mut was_last_word_a_stop_word = false; + for word in words.iter() { + if let Some(word) = word { + let positions = match words_positions.get(word) { + Some(positions) => positions.iter().map(|p| (p, 0, p)).collect(), + None => return Ok(vec![]), + }; + groups_positions.push(positions); + + if was_last_word_a_stop_word { + consecutive = false; + } + was_last_word_a_stop_word = false; + } else { + if !was_last_word_a_stop_word { + consecutive = false; + } + + was_last_word_a_stop_word = true; + } } - plane_sweep(groups_positions, true)? + plane_sweep(groups_positions, consecutive)? } Or(_, ops) => { let mut result = Vec::new();