feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FuzzyMatcher: add option to match text with spaces

Browse Source 
Change-Id: I0480b57d27f3625933005ca2233e9612df53072d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
David Schulz
2022-09-19 13:04:25 +02:00
parent c767f193ce
commit 85c5edcb6b
5 changed files with 134 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
tests/auto/utils/fuzzymatcher/tst_fuzzymatcher.cpp
View File

@@ -13,8 +13,12 @@ class tst_FuzzyMatcher : public QObject
private slots:
void fuzzyMatcher();
void fuzzyMatcher_data();
void fuzzyMatcherMultiWord();
void fuzzyMatcherMultiWord_data();
void highlighting();
void highlighting_data();
void highlightingMultiWord();
void highlightingMultiWord_data();
};
void tst_FuzzyMatcher::fuzzyMatcher()
@@ -64,7 +68,38 @@ void tst_FuzzyMatcher::fuzzyMatcher_data()
QTest::newRow("middle-no-hump") << "window" << "mainwindow.cpp" << 4;
QTest::newRow("case-insensitive") << "window" << "MAINWINDOW.cpp" << 4;
QTest::newRow("case-insensitive-2") << "wINDow" << "MainwiNdow.cpp" << 4;
QTest::newRow("uppercase-word-and-humps") << "htvideoele" << "HTMLVideoElement" << 0;
}
void tst_FuzzyMatcher::fuzzyMatcherMultiWord()
{
QFETCH(QString, pattern);
QFETCH(QString, candidate);
QFETCH(int, expectedIndex);
const QRegularExpression regExp
= FuzzyMatcher::createRegExp(pattern, FuzzyMatcher::CaseSensitivity::CaseInsensitive, true);
const QRegularExpressionMatch match = regExp.match(candidate);
QCOMPARE(match.capturedStart(), expectedIndex);
}
void tst_FuzzyMatcher::fuzzyMatcherMultiWord_data()
{
QTest::addColumn<QString>("pattern");
QTest::addColumn<QString>("candidate");
QTest::addColumn<int>("expectedIndex");
QTest::newRow("one_word") << "fo" << "foo" << 0;
QTest::newRow("one_word_complete") << "foo" << "foo" << 0;
QTest::newRow("one_word_mismatch") << "bar" << "foo" << -1;
QTest::newRow("two_words") << "fb" << "foo bar" << 0;
QTest::newRow("two_wordslU") << "fb" << "Foo Bar" << 0;
QTest::newRow("two_wordsUl") << "FB" << "foo bar" << 0;
QTest::newRow("two_words_one_match") << "ba" << "foo bar" << 4;
QTest::newRow("two_words_complete_match") << "foo bar" << "foo bar" << 0;
QTest::newRow("wrong_order") << "bf" << "foo bar" << -1;
QTest::newRow("no_space") << "fb" << "foobar" << -1;
QTest::newRow("inword_first_match") << "oob" << "foo bar" << -1;
QTest::newRow("inword_second_match") << "foar" << "foo bar" << -1;
}
typedef QVector<QPair<int, int>> Matches;
@@ -142,5 +177,57 @@ void tst_FuzzyMatcher::highlighting_data()
<< Matches{{0, 2}, {4, 8}};
}
void tst_FuzzyMatcher::highlightingMultiWord()
{
QFETCH(QString, pattern);
QFETCH(QString, candidate);
QFETCH(Matches, matches);
const QRegularExpression regExp
= FuzzyMatcher::createRegExp(pattern, FuzzyMatcher::CaseSensitivity::CaseInsensitive, true);
const QRegularExpressionMatch match = regExp.match(candidate);
const FuzzyMatcher::HighlightingPositions positions
= FuzzyMatcher::highlightingPositions(match);
QCOMPARE(positions.starts.size(), matches.size());
for (int i = 0; i < positions.starts.size(); ++i) {
const QPair<int, int> &match = matches.at(i);
QCOMPARE(positions.starts.at(i), match.first);
QCOMPARE(positions.lengths.at(i), match.second);
}
}
void tst_FuzzyMatcher::highlightingMultiWord_data()
{
QTest::addColumn<QString>("pattern");
QTest::addColumn<QString>("candidate");
QTest::addColumn<Matches>("matches");
QTest::newRow("one_word") << "fo"
<< "foo" << Matches{{0, 2}};
QTest::newRow("one_word_complete") << "foo"
<< "foo" << Matches{{0, 3}};
QTest::newRow("one_word_mismatch") << "bar"
<< "foo" << Matches{};
QTest::newRow("two_words") << "fb"
<< "foo bar" << Matches{{0, 1}, {4, 1}};
QTest::newRow("two_wordslU") << "fb"
<< "Foo Bar" << Matches{{0, 1}, {4, 1}};
QTest::newRow("two_wordsUl") << "FB"
<< "foo bar" << Matches{{0, 1}, {4, 1}};
QTest::newRow("two_words_one_match") << "ba"
<< "foo bar" << Matches{{4, 2}};
QTest::newRow("two_words_complete_match") << "foo bar"
<< "foo bar" << Matches{{0, 7}};
QTest::newRow("wrong_order") << "bf"
<< "foo bar" << Matches{};
QTest::newRow("no_space") << "fb"
<< "foobar" << Matches{};
QTest::newRow("inword_first_match") << "oob"
<< "foo bar" << Matches{};
QTest::newRow("inword_second_match") << "foar"
<< "foo bar" << Matches{};
}
QTEST_APPLESS_MAIN(tst_FuzzyMatcher)
#include "tst_fuzzymatcher.moc"