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

Fix searching for repeated characters in files.

Browse Source 
Searching for aaaa in aaaaaaaa would give 5 results instead of 2 in case
of non-regexp search.

Task-number: QTCREATORBUG-7883
Change-Id: I5936090b3eef5e68405201fe63d02bf0dd2469d5
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Eike Ziller
2013-06-13 16:37:14 +02:00
parent 021dbc2e96
commit 4680099aa1
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/filesearch.cpp
View File

@@ -173,6 +173,7 @@ void runFileSearch(QFutureInterface<FileSearchResultList> &future,
results << FileSearchResult(s, lineNr, resultItemText, results << FileSearchResult(s, lineNr, resultItemText,
regionPtr - chunkPtr, termLength, regionPtr - chunkPtr, termLength,
QStringList()); QStringList());
regionPtr += termLength - 1; // another +1 done by for-loop
++numMatches; ++numMatches;
} }
} }

1
tests/auto/filesearch/testfile.txt
View File

@@ -2,4 +2,5 @@ wholeWordAtStart bla foo blubb wholeWordAtEnd
search to find multiple find results search to find multiple find results
search CaseSensitively for casesensitive search CaseSensitively for casesensitive
here you find another result here you find another result
aaaaaaaa this line has 2 results for four a in a row
wholeWordAtVeryEnd wholeWordAtVeryEnd

22
tests/auto/filesearch/tst_filesearch.cpp
View File

@@ -46,6 +46,11 @@ bool operator==(const Utils::FileSearchResult &r1, const Utils::FileSearchResult
class tst_FileSearch : public QObject class tst_FileSearch : public QObject
{ {
Q_OBJECT Q_OBJECT
public:
enum RegExpFlag {
NoRegExp,
RegExp
};
private slots: private slots:
void multipleResults(); void multipleResults();
@@ -59,12 +64,15 @@ namespace {
void test_helper(const Utils::FileSearchResultList &expectedResults, void test_helper(const Utils::FileSearchResultList &expectedResults,
const QString &term, const QString &term,
QTextDocument::FindFlags flags) QTextDocument::FindFlags flags, tst_FileSearch::RegExpFlag regexp = tst_FileSearch::NoRegExp)
{ {
Utils::FileIterator *it = new Utils::FileIterator(QStringList() << QLatin1String(FILENAME), QList<QTextCodec *>() << QTextCodec::codecForLocale()); Utils::FileIterator *it = new Utils::FileIterator(QStringList() << QLatin1String(FILENAME), QList<QTextCodec *>() << QTextCodec::codecForLocale());
QFutureWatcher<Utils::FileSearchResultList> watcher; QFutureWatcher<Utils::FileSearchResultList> watcher;
QSignalSpy ready(&watcher, SIGNAL(resultsReadyAt(int,int))); QSignalSpy ready(&watcher, SIGNAL(resultsReadyAt(int,int)));
watcher.setFuture(Utils::findInFiles(term, it, flags)); if (regexp == tst_FileSearch::NoRegExp)
watcher.setFuture(Utils::findInFiles(term, it, flags));
else
watcher.setFuture(Utils::findInFilesRegExp(term, it, flags));
watcher.future().waitForFinished(); watcher.future().waitForFinished();
QTest::qWait(100); // process events QTest::qWait(100); // process events
QCOMPARE(ready.count(), 1); QCOMPARE(ready.count(), 1);
@@ -83,6 +91,16 @@ void tst_FileSearch::multipleResults()
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 2, QLatin1String("search to find multiple find results"), 24, 4, QStringList()); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 2, QLatin1String("search to find multiple find results"), 24, 4, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 4, QLatin1String("here you find another result"), 9, 4, QStringList()); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 4, QLatin1String("here you find another result"), 9, 4, QStringList());
test_helper(expectedResults, QLatin1String("find"), QTextDocument::FindFlags(0)); test_helper(expectedResults, QLatin1String("find"), QTextDocument::FindFlags(0));
expectedResults.clear();
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList());
test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags(0));
expectedResults.clear();
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList() << QLatin1String("aaaa"));
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList() << QLatin1String("aaaa"));
test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags(0), RegExp);
} }
void tst_FileSearch::caseSensitive() void tst_FileSearch::caseSensitive()