From ef13c6a5b602192ddd2424036424884a1be31a4a Mon Sep 17 00:00:00 2001
From: Samyak S Sarnayak <samyak201@gmail.com>
Date: Thu, 13 Oct 2022 22:39:55 +0530
Subject: [PATCH] Perform filter after enumerate to keep origin indices

---
 milli/src/search/criteria/mod.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/milli/src/search/criteria/mod.rs b/milli/src/search/criteria/mod.rs
index 96ed0bf6c..631dd2385 100644
--- a/milli/src/search/criteria/mod.rs
+++ b/milli/src/search/criteria/mod.rs
@@ -425,7 +425,13 @@ pub fn resolve_phrase(ctx: &dyn Context, phrase: &[Option<String>]) -> Result<Ro
     for win in phrase.windows(winsize) {
         // Get all the documents with the matching distance for each word pairs.
         let mut bitmaps = Vec::with_capacity(winsize.pow(2));
-        for (offset, s1) in win.iter().filter_map(|w| w.as_ref()).enumerate() {
+        for (offset, s1) in win.iter().enumerate().filter_map(|(index, word)| {
+                if let Some(word) = word {
+                    Some((index, word))
+                } else {
+                    None
+                }
+            }) {
             for (dist, s2) in win.iter().skip(offset + 1).enumerate().filter_map(|(index, word)| {
                 if let Some(word) = word {
                     Some((index, word))