aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/coreplugin/locator/filesystemfilter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/coreplugin/locator/filesystemfilter.cpp')
-rw-r--r--src/plugins/coreplugin/locator/filesystemfilter.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp
index 41ad77e5c1..dcb5925842 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.cpp
+++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp
@@ -102,7 +102,7 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF
const QStringList files = dirInfo.entryList(fileFilter,
QDir::Name|QDir::IgnoreCase|QDir::LocaleAware);
- const QRegularExpression regExp = createRegExp(entryFileName, caseSensitivity_);
+ QRegularExpression regExp = createRegExp(entryFileName, caseSensitivity_);
if (!regExp.isValid())
return {};
@@ -122,7 +122,10 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF
}
}
// 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();
for (const QString &file : files) {
if (future.isCanceled())