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

FuzzyMatcher: Handle digits as camel hump

Browse Source 
Allow searching for "Fancy4PartThingy" with the
more intuitive pattern "f4pt" as well as with the
pattern "fpt" that already worked before.

Fixes: QTCREATORBUG-22671
Change-Id: I3a7c1a5b7f57d2f2bdd7d0c6e23b46f6bbb64d77
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2019-07-13 08:45:26 +02:00
committed by André Hartmann
parent 52a58afc79
commit 9f136678be
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/fuzzymatcher.cpp
View File

@@ -75,7 +75,7 @@ QRegularExpression FuzzyMatcher::createRegExp(
const QLatin1String upperSnakeWordContinuation("[A-Z0-9]*_");
keyRegExp += "(?:";
for (const QChar &c : pattern) {
if (!c.isLetter()) {
if (!c.isLetterOrNumber()) {
if (c == question) {
keyRegExp += '.';
plainRegExp += ").(";

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

@@ -68,7 +68,12 @@ void tst_FuzzyMatcher::fuzzyMatcher_data()
QTest::newRow("incorrect-hump") << "lyn" << "VeryLongCamelHump" << -1;
QTest::newRow("humps") << "VL" << "VeryLongCamelHump" << 0;
QTest::newRow("skipped-humps-upper") << "VH" << "VeryLongCamelHump" << -1;
QTest::newRow("numbers") << "4" << "Test4Fun" << 4;
QTest::newRow("numbers-searched") << "4" << "Test4Fun" << 4;
QTest::newRow("numbers-skipped") << "fpt" << "Fancy4PartThingy" << 0;
QTest::newRow("numbers-camel") << "f4pt" << "Fancy4PartThingy" << 0;
QTest::newRow("multi-numbers-camel") << "f4pt" << "Fancy4567PartThingy" << 0;
QTest::newRow("numbers-underscore") << "f4pt" << "fancy_4_part_thingy" << 0;
QTest::newRow("numbers-underscore-upper") << "f4pt" << "FANCY_4_PART_THINGY" << 0;
QTest::newRow("question-wildcard") << "Lon?Ca" << "VeryLongCamelHump" << 4;
QTest::newRow("unmatched-question-wildcard") << "Long?Ca" << "VeryLongCamelHump" << -1;
QTest::newRow("asterisk-wildcard") << "Long*Ca" << "VeryLongCamelHump" << 4;
@@ -136,8 +141,18 @@ void tst_FuzzyMatcher::highlighting_data()
<< Matches{{4, 2}, {8, 2}};
QTest::newRow("duplicate-match") << "som" << "SomeMatch"
<< Matches{{0, 3}};
QTest::newRow("numbers") << "4" << "TestJust4Fun"
<< Matches{{8, 1}};
QTest::newRow("numbers-searched") << "4" << "TestJust4Fun"
<< Matches{{8, 1}};
QTest::newRow("numbers-plain") << "boot2qt" << "use_boot2qt_for_embedded"
<< Matches{{4, 7}};
QTest::newRow("numbers-skipped") << "fpt" << "Fancy4PartThingy"
<< Matches{{0, 1}, {6, 1}, {10, 1}};
QTest::newRow("numbers-camel") << "f4pt" << "Fancy4PartThingy"
<< Matches{{0, 1}, {5, 2}, {10, 1}};
QTest::newRow("numbers-snake") << "f4pt" << "fancy_4_part_thingy"
<< Matches{{0, 1}, {6, 1}, {8, 1}, {13, 1}};
QTest::newRow("numbers-snake-upper") << "f4pt" << "FANCY_4_PART_THINGY"
<< Matches{{0, 1}, {6, 1}, {8, 1}, {13, 1}};
QTest::newRow("wildcard-asterisk") << "Lo*Hu" << "VeryLongCamelHump"
<< Matches{{4, 2}, {13, 2}};
QTest::newRow("wildcard-question") << "Lo?g" << "VeryLongCamelHump"