rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do word splitting in completer

Browse Source
This commit is contained in:
Nicolas Werner 2022-01-31 21:36:22 +01:00
parent 3c208cd717
commit eae43782a3
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/CompletionProxyModel.cpp
View File

@ -6,6 +6,7 @@
#include "CompletionProxyModel.h" #include "CompletionProxyModel.h"
#include <QRegularExpression> #include <QRegularExpression>
#include <QTextBoundaryFinder>
#include "CompletionModelRoles.h" #include "CompletionModelRoles.h"
#include "Logging.h" #include "Logging.h"
@ -44,27 +45,31 @@ CompletionProxyModel::CompletionProxyModel(QAbstractItemModel *model,
// insert the partial matches // insert the partial matches
for (int i = 0; i < sourceModel()->rowCount(); i++) { for (int i = 0; i < sourceModel()->rowCount(); i++) {
auto string1 = sourceModel() auto insertParts = [i, this](const QString &str) {
->data(sourceModel()->index(i, 0), CompletionModel::SearchRole) if (str.isEmpty())
.toString() return;
.toLower();
auto split1 = QStringView(string1).split(splitPoints, Qt::SkipEmptyParts); QTextBoundaryFinder finder(QTextBoundaryFinder::BoundaryType::Word, str);
for (const auto &e : qAsConst(split1)) { finder.toStart();
trie_.insert(e.toUcs4(), i); do {
} auto start = finder.position();
finder.toNextBoundary();
auto end = finder.position();
auto string2 = sourceModel() auto ref = str.midRef(start, end - start).trimmed();
->data(sourceModel()->index(i, 0), CompletionModel::SearchRole2) if (!ref.isEmpty())
.toString() trie_.insert(ref.toUcs4(), i);
.toLower(); } while (finder.position() < str.size());
};
if (!string2.isEmpty()) { insertParts(sourceModel()
auto split2 = QStringView(string2).split(splitPoints, Qt::SkipEmptyParts); ->data(sourceModel()->index(i, 0), CompletionModel::SearchRole)
for (const auto &e : qAsConst(split2)) { .toString()
trie_.insert(e.toUcs4(), i); .toLower());
} insertParts(sourceModel()
} ->data(sourceModel()->index(i, 0), CompletionModel::SearchRole2)
.toString()
.toLower());
} }
connect( connect(