thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change allowed mistakes, fix minor style issues, remove old completer function from inputbar

Browse source
This commit is contained in:
Jedi18 2021-03-07 00:18:24 +05:30
parent 1f8a3ae1e8
commit 8870455f9d
8 changed files with 43 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/CompletionProxyModel.h
View file

@ -54,19 +54,19 @@ struct trie
}
std::vector<Value> search(const QVector<Key> &keys, //< TODO(Nico): replace this with a span
size_t limit,
size_t max_distance = 2) const
size_t result_count_limit,
size_t max_edit_distance = 2) const
{
std::vector<Value> ret;
if (!limit)
if (!result_count_limit)
return ret;
if (keys.isEmpty())
return valuesAndSubvalues(limit);
return valuesAndSubvalues(result_count_limit);
auto append = [&ret, limit](std::vector<Value> &&in) {
auto append = [&ret, result_count_limit](std::vector<Value> &&in) {
for (auto &&v : in) {
if (ret.size() >= limit)
if (ret.size() >= result_count_limit)
return;
if (std::find(ret.begin(), ret.end(), v) == ret.end()) {
@ -76,11 +76,12 @@ struct trie
};
if (auto e = this->next.find(keys[0]); e != this->next.end()) {
append(e->second.search(keys.mid(1), limit, max_distance));
append(
e->second.search(keys.mid(1), result_count_limit, max_edit_distance));
}
if (max_distance && ret.size() < limit) {
max_distance -= 1;
if (max_edit_distance && ret.size() < result_count_limit) {
max_edit_distance -= 1;
// swap chars case
if (keys.size() >= 2) {
@ -95,27 +96,31 @@ struct trie
}
if (t) {
append(t->search(
keys.mid(2), (limit - ret.size()) * 2, max_distance));
append(t->search(keys.mid(2),
(result_count_limit - ret.size()) * 2,
max_edit_distance));
}
}
// delete character case
append(this->search(keys.mid(1), (limit - ret.size()) * 2, max_distance));
append(this->search(
keys.mid(1), (result_count_limit - ret.size()) * 2, max_edit_distance));
// substitute and insert cases
for (const auto &[k, t] : this->next) {
if (k == keys[0] || ret.size() >= limit)
if (k == keys[0] || ret.size() >= result_count_limit)
break;
// substitute
append(t.search(keys.mid(1), limit - ret.size(), max_distance));
append(t.search(
keys.mid(1), result_count_limit - ret.size(), max_edit_distance));
if (ret.size() >= limit)
if (ret.size() >= result_count_limit)
break;
// insert
append(t.search(keys, limit - ret.size(), max_distance));
append(t.search(
keys, result_count_limit - ret.size(), max_edit_distance));
}
}
@ -128,7 +133,9 @@ class CompletionProxyModel : public QAbstractProxyModel
Q_OBJECT
public:
CompletionProxyModel(QAbstractItemModel *model, QObject *parent = nullptr);
CompletionProxyModel(QAbstractItemModel *model,
int max_mistakes = 2,
QObject *parent = nullptr);
void invalidate();
@ -156,4 +163,5 @@ private:
QString searchString;
trie<uint, int> trie_;
std::vector<int> mapping;
int maxMistakes_;
};