Fix anchor pagination

Author: apexskier

crates/jmap/src/api/query.rs

@@ -82,47 +82,36 @@ impl QueryResponseBuilder {
     pub fn add_id(&mut self, id: Id) -> bool {
         let document_id = id.document_id();
 
-        // Pagination
         if !self.has_anchor {
+            // By position
             if self.position >= 0 {
                 if self.position > 0 {
                     self.position -= 1;
                 } else {
                     self.response.ids.push(id);
-                    if self.response.ids.len() == self.limit {
-                        return false;
-                    }
                 }
             } else {
                 self.response.ids.push(id);
             }
-        } else if self.anchor_offset >= 0 {
+        } else {
+            // By anchor
             if !self.anchor_found {
-                if document_id != self.anchor {
+                self.position += 1;
+                self.anchor_found = document_id == self.anchor;
+                if !self.anchor_found {
                     return true;
                 }
-                self.anchor_found = true;
             }
 
             if self.anchor_offset > 0 {
                 self.anchor_offset -= 1;
+                self.position += 1;
             } else {
                 self.response.ids.push(id);
-                if self.response.ids.len() == self.limit {
-                    return false;
-                }
-            }
-        } else {
-            self.anchor_found = document_id == self.anchor;
-            self.response.ids.push(id);
-
-            if self.anchor_found {
-                self.position = self.anchor_offset;
-                return false;
             }
         }
 
-        true
+        self.response.ids.len() != self.limit
     }
 
     pub fn is_full(&self) -> bool {