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

Locator: Fix regression of filesystem lookup with line/column

Browse Source 
This amends commit 40921421ae.

Change-Id: Ib546813e77395c8816758f9adb21a71f072abd49
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2020-05-11 08:49:38 +03:00
committed by Orgad Shaneh
parent f6210b3569
commit c25a8c0a58
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/coreplugin/locator/filesystemfilter.cpp
View File

@@ -102,7 +102,7 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF
const QStringList files = dirInfo.entryList(fileFilter, const QStringList files = dirInfo.entryList(fileFilter,
QDir::Name|QDir::IgnoreCase|QDir::LocaleAware); QDir::Name|QDir::IgnoreCase|QDir::LocaleAware);
const QRegularExpression regExp = createRegExp(entryFileName, caseSensitivity_); QRegularExpression regExp = createRegExp(entryFileName, caseSensitivity_);
if (!regExp.isValid()) if (!regExp.isValid())
return {}; return {};
@@ -122,7 +122,10 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF
} }
} }
// file names can match with +linenumber or :linenumber // file names can match with +linenumber or :linenumber
const EditorManager::FilePathInfo fp = EditorManager::splitLineAndColumnNumber(entry); const EditorManager::FilePathInfo fp = EditorManager::splitLineAndColumnNumber(entryFileName);
regExp = createRegExp(fp.filePath, caseSensitivity_);
if (!regExp.isValid())
return {};
const QString fileName = QFileInfo(fp.filePath).fileName(); const QString fileName = QFileInfo(fp.filePath).fileName();
for (const QString &file : files) { for (const QString &file : files) {
if (future.isCanceled()) if (future.isCanceled())