From c25a8c0a586956dec15153a8682863566496bbae Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 11 May 2020 08:49:38 +0300
Subject: Locator: Fix regression of filesystem lookup with line/column
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This amends commit 40921421ae7d6ad7c7644e0f7ffe900ccd70ee5e.

Change-Id: Ib546813e77395c8816758f9adb21a71f072abd49
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/plugins/coreplugin/locator/filesystemfilter.cpp | 7 +++++--
 1 file 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())
-- 
cgit v1.2.3