fix(dictionary): had unsorted chunks after the previous chunk ended

lotem · lotem · commit dd6af3dee58b · 2021-11-28T23:46:24.000+08:00
Fixes #507
diff --git a/src/rime/dict/dictionary.cc b/src/rime/dict/dictionary.cc
@@ -131,11 +131,12 @@ bool DictEntryIterator::FindNextEntry() {
   if (++chunk.cursor >= chunk.size) {
     ++chunk_index_;
   }
-  else {
-    // reorder chunks since the current chunk has got a new head element
-    Sort();
+  if (exhausted()) {
+    return false;
   }
-  return !exhausted();
+  // reorder chunks to move the one with the best entry to head
+  Sort();
+  return true;
 }
 
 bool DictEntryIterator::Next() {

Original file line number	Diff line number	Diff line change
`@@ -131,11 +131,12 @@ bool DictEntryIterator::FindNextEntry() {`
`131`	`131`	`if (++chunk.cursor >= chunk.size) {`
`132`	`132`	`++chunk_index_;`
`133`	`133`	`}`
`134`		`- else {`
`135`		`- // reorder chunks since the current chunk has got a new head element`
`136`		`- Sort();`
	`134`	`+ if (exhausted()) {`
	`135`	`+ return false;`
`137`	`136`	`}`
`138`		`- return !exhausted();`
	`137`	`+ // reorder chunks to move the one with the best entry to head`
	`138`	`+ Sort();`
	`139`	`+ return true;`
`139`	`140`	`}`
`140`	`141`
`141`	`142`	`bool DictEntryIterator::Next() {`