Fix completer fuzzy match not applying after prefix match and insert being broken
This commit is contained in:
parent
29625ae253
commit
8922a47776
|
@ -57,7 +57,7 @@ struct trie
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<Value> search(const QVector<Key> &keys,
|
std::vector<Value> search(const QVector<Key> &keys, //< TODO(Nico): replace this with a span
|
||||||
size_t limit,
|
size_t limit,
|
||||||
size_t max_distance = 2) const
|
size_t max_distance = 2) const
|
||||||
{
|
{
|
||||||
|
@ -65,6 +65,9 @@ struct trie
|
||||||
if (!limit)
|
if (!limit)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
if (keys.isEmpty())
|
||||||
|
return valuesAndSubvalues(limit);
|
||||||
|
|
||||||
auto append = [&ret, limit](std::vector<Value> &&in) {
|
auto append = [&ret, limit](std::vector<Value> &&in) {
|
||||||
for (auto &&v : in) {
|
for (auto &&v : in) {
|
||||||
if (ret.size() >= limit)
|
if (ret.size() >= limit)
|
||||||
|
@ -76,24 +79,11 @@ struct trie
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
{
|
if (auto e = this->next.find(keys[0]); e != this->next.end()) {
|
||||||
auto t = this;
|
append(e->second.search(keys.mid(1), limit, max_distance));
|
||||||
int i = 0;
|
|
||||||
for (; i < (int)keys.size(); i++) {
|
|
||||||
if (auto e = t->next.find(keys[i]); e != t->next.end()) {
|
|
||||||
t = &e->second;
|
|
||||||
} else {
|
|
||||||
t = nullptr;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t) {
|
if (max_distance && ret.size() < limit) {
|
||||||
ret = t->valuesAndSubvalues(limit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (max_distance && keys.size() < static_cast<int>(limit) && keys.size() > 1) {
|
|
||||||
max_distance -= 1;
|
max_distance -= 1;
|
||||||
|
|
||||||
// swap chars case
|
// swap chars case
|
||||||
|
@ -123,13 +113,13 @@ struct trie
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// substitute
|
// substitute
|
||||||
append(this->search(keys.mid(1), limit - ret.size(), max_distance));
|
append(t.search(keys.mid(1), limit - ret.size(), max_distance));
|
||||||
|
|
||||||
if (ret.size() >= limit)
|
if (ret.size() >= limit)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// insert
|
// insert
|
||||||
append(this->search(keys, limit - ret.size(), max_distance));
|
append(t.search(keys, limit - ret.size(), max_distance));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue