Spelling corrections are included in smart suggestions

But that may result in duplicated suggestions as demonstrated by some
test points in the Suggestion.smartSuggestions unit-test.

Author: veloman-yunkan

src/suggestion.cpp

@@ -475,13 +475,18 @@ SuggestionSearch::Results SuggestionSearch::getSpellingSuggestions(uint32_t maxC
   return r;
 }
 SuggestionSearch::Results SuggestionSearch::getSmartSuggestions(uint32_t maxCount) const {
-  if ( static_cast<uint32_t>(getEstimatedMatches()) > maxCount ) {
-    return getAutocompletionSuggestions(maxCount);
-  }
-
   SuggestionSearch::Results r;
-  for ( const auto& s : getResults(0, maxCount) ) {
-    r.push_back(s);
+  const uint32_t titleSuggestionCount = getEstimatedMatches();
+  if ( titleSuggestionCount == 0 || titleSuggestionCount > maxCount ) {
+    r = getAutocompletionSuggestions(maxCount);
+    if ( r.size() < maxCount ) {
+      const auto corrections = getSpellingSuggestions(maxCount - r.size());
+      r.insert(r.end(), corrections.begin(), corrections.end());
+    }
+  } else {
+    for ( const auto& s : getResults(0, maxCount) ) {
+      r.push_back(s);
+    }
   }
   return r;
 }

test/suggestion.cpp

@@ -982,6 +982,7 @@ TEST(Suggestion, smartSuggestions) {
   EXPECT_SMART_SUGGESTION_RESULTS(archive, "bi", 4, ({
     {"", "", "<b>big</b>" },
     {"", "", "<b>birth</b>" },
+    {"", "", "<b>big</b>" }, // XXX: duplicated result due to spelling correction
   }));
 
   EXPECT_SMART_SUGGESTION_RESULTS(archive, "date bi", 10, ({
@@ -994,6 +995,7 @@ TEST(Suggestion, smartSuggestions) {
   EXPECT_SMART_SUGGESTION_RESULTS(archive, "date bi", 3, ({
     {"", "", "date <b>big</b>" },
     {"", "", "date <b>birth</b>" },
+    {"", "", "date <b>big</b>" }, // XXX: duplicated result due to spelling correction
   }));
 
   EXPECT_SMART_SUGGESTION_RESULTS(archive, "da", 20, ({
@@ -1020,6 +1022,7 @@ TEST(Suggestion, smartSuggestions) {
     {"", "", "<b>data</b>" },
     {"", "", "<b>date</b>" },
     {"", "", "<b>day</b>"  },
+    {"", "", "<b>day</b>"  }, // XXX: duplicated result due to spelling correction
   }));
 
   // Autocompletion results are selected based on frequency ("daily" and "data"
@@ -1043,6 +1046,12 @@ TEST(Suggestion, smartSuggestions) {
     {"", "", "birth <b>data</b>" },
     {"", "", "birth <b>date</b>" },
     {"", "", "birth <b>day</b>"  },
+    {"", "", "birth <b>day</b>"  }, // XXX: duplicated result due to spelling correction
+  }));
+
+  EXPECT_SMART_SUGGESTION_RESULTS(archive, "barth", 5, ({
+    {"", "", "<b>birth</b>" },
+    {"", "", "<b>earth</b>" },
   }));
 }