Locator: De-duplicate highlightInfo generation for camel humps

Change-Id: I5a3fd28ddd68b2ac17a76384cffad12064d06259
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/plugins/coreplugin/locator/basefilefilter.cpp b/src/plugins/coreplugin/locator/basefilefilter.cpp
index c992b883738..26db4474cc3 100644
--- a/src/plugins/coreplugin/locator/basefilefilter.cpp
+++ b/src/plugins/coreplugin/locator/basefilefilter.cpp
@@ -26,7 +26,6 @@
 #include "basefilefilter.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <utils/camelhumpmatcher.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
@@ -142,16 +141,14 @@ QList<LocatorFilterEntry> BaseFileFilter::matchesFor(QFutureInterface<LocatorFil
             filterEntry.fileName = path;
             filterEntry.extraInfo = FileUtils::shortNativePath(FileName(fi));
 
-            LocatorFilterEntry::HighlightInfo::DataType hDataType = LocatorFilterEntry::HighlightInfo::DisplayName;
             const bool betterMatch = match.capturedStart() == 0;
             if (hasPathSeparator) {
                 match = regexp.match(filterEntry.extraInfo);
-                hDataType = LocatorFilterEntry::HighlightInfo::ExtraInfo;
+                filterEntry.highlightInfo =
+                        highlightInfo(match, LocatorFilterEntry::HighlightInfo::ExtraInfo);
+            } else {
+                filterEntry.highlightInfo = highlightInfo(match);
             }
-            const CamelHumpMatcher::HighlightingPositions positions =
-                    CamelHumpMatcher::highlightingPositions(match);
-            filterEntry.highlightInfo =
-                    LocatorFilterEntry::HighlightInfo(positions.starts, positions.lengths, hDataType);
 
             if (betterMatch)
                 betterEntries.append(filterEntry);