From 62d971b30ba19053eb5944b8dca8e4c587a62181 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Thu, 5 Oct 2017 10:18:44 +0200
Subject: [PATCH] Locator: De-duplicate highlightInfo generation for camel
 humps

Change-Id: I5a3fd28ddd68b2ac17a76384cffad12064d06259
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/coreplugin/locator/basefilefilter.cpp    | 11 ++++-------
 src/plugins/coreplugin/locator/ilocatorfilter.cpp    |  9 +++++++++
 src/plugins/coreplugin/locator/ilocatorfilter.h      |  2 ++
 .../coreplugin/locator/opendocumentsfilter.cpp       |  6 +-----
 src/plugins/cpptools/cppcurrentdocumentfilter.cpp    | 12 +++++-------
 src/plugins/cpptools/cpplocatorfilter.cpp            |  6 +-----
 src/plugins/qmljstools/qmljsfunctionfilter.cpp       |  6 +-----
 7 files changed, 23 insertions(+), 29 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);
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
index 1681544608d..541f7e31668 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
@@ -228,6 +228,15 @@ QRegularExpression ILocatorFilter::createRegExp(const QString &text)
                                   : CamelHumpMatcher::createCamelHumpRegExp(text);
 }
 
+LocatorFilterEntry::HighlightInfo ILocatorFilter::highlightInfo(
+        const QRegularExpressionMatch &match, LocatorFilterEntry::HighlightInfo::DataType dataType)
+{
+    const CamelHumpMatcher::HighlightingPositions positions =
+            CamelHumpMatcher::highlightingPositions(match);
+
+    return LocatorFilterEntry::HighlightInfo(positions.starts, positions.lengths, dataType);
+}
+
 /*!
     Specifies a title for configuration dialogs.
 */
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h
index c0dd8ec4265..09acb1be205 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.h
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.h
@@ -145,6 +145,8 @@ public:
     static Qt::CaseSensitivity caseSensitivity(const QString &str);
     static bool containsWildcard(const QString &str);
     static QRegularExpression createRegExp(const QString &text);
+    LocatorFilterEntry::HighlightInfo highlightInfo(const QRegularExpressionMatch &match,
+        LocatorFilterEntry::HighlightInfo::DataType dataType = LocatorFilterEntry::HighlightInfo::DisplayName);
 
     static QString msgConfigureDialogTitle();
     static QString msgPrefixLabel();
diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
index 9f025ec6985..8a7c6718f84 100644
--- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
+++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
@@ -27,7 +27,6 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
-#include <utils/camelhumpmatcher.h>
 #include <utils/fileutils.h>
 
 #include <QAbstractItemModel>
@@ -75,13 +74,10 @@ QList<LocatorFilterEntry> OpenDocumentsFilter::matchesFor(QFutureInterface<Locat
         QString displayName = editorEntry.displayName;
         const QRegularExpressionMatch match = regexp.match(displayName);
         if (match.hasMatch()) {
-            const CamelHumpMatcher::HighlightingPositions positions =
-                    CamelHumpMatcher::highlightingPositions(match);
             LocatorFilterEntry filterEntry(this, displayName, QString(fileName + fp.postfix));
             filterEntry.extraInfo = FileUtils::shortNativePath(FileName::fromString(fileName));
             filterEntry.fileName = fileName;
-            filterEntry.highlightInfo.starts = positions.starts;
-            filterEntry.highlightInfo.lengths = positions.lengths;
+            filterEntry.highlightInfo = highlightInfo(match);
             if (match.capturedStart() == 0)
                 betterEntries.append(filterEntry);
             else
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index 440e53439f3..bae78edce6e 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -30,7 +30,6 @@
 #include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
-#include <utils/camelhumpmatcher.h>
 
 #include <QRegularExpression>
 
@@ -96,14 +95,13 @@ QList<Core::LocatorFilterEntry> CppCurrentDocumentFilter::matchesFor(
 
             Core::LocatorFilterEntry filterEntry(this, name, id, info->icon());
             filterEntry.extraInfo = extraInfo;
-            if (!match.hasMatch()) {
+            if (match.hasMatch()) {
+                filterEntry.highlightInfo = highlightInfo(match);
+            } else {
                 match = regexp.match(extraInfo);
-                filterEntry.highlightInfo.dataType = Core::LocatorFilterEntry::HighlightInfo::ExtraInfo;
+                filterEntry.highlightInfo =
+                        highlightInfo(match, Core::LocatorFilterEntry::HighlightInfo::ExtraInfo);
             }
-            const CamelHumpMatcher::HighlightingPositions positions =
-                    CamelHumpMatcher::highlightingPositions(match);
-            filterEntry.highlightInfo.starts = positions.starts;
-            filterEntry.highlightInfo.lengths = positions.lengths;
 
             if (betterMatch)
                 betterEntries.append(filterEntry);
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index f1134622176..977c6188554 100644
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -28,7 +28,6 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/algorithm.h>
-#include <utils/camelhumpmatcher.h>
 
 #include <QRegularExpression>
 
@@ -94,10 +93,7 @@ QList<Core::LocatorFilterEntry> CppLocatorFilter::matchesFor(
                 // to update the match if the displayName is different from matchString
                 if (matchString != filterEntry.displayName)
                     match = regexp.match(filterEntry.displayName);
-                const CamelHumpMatcher::HighlightingPositions positions =
-                        CamelHumpMatcher::highlightingPositions(match);
-                filterEntry.highlightInfo.starts = positions.starts;
-                filterEntry.highlightInfo.lengths = positions.lengths;
+                filterEntry.highlightInfo = highlightInfo(match);
 
                 if (matchString.startsWith(entry, caseSensitivityForPrefix))
                     bestEntries.append(filterEntry);
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index 930eff714a6..52577aff99b 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -28,7 +28,6 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/algorithm.h>
-#include <utils/camelhumpmatcher.h>
 
 #include <QRegularExpression>
 
@@ -82,11 +81,8 @@ QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor(
             if (match.hasMatch()) {
                 QVariant id = qVariantFromValue(info);
                 Core::LocatorFilterEntry filterEntry(this, info.displayName, id/*, info.icon*/);
-                const CamelHumpMatcher::HighlightingPositions positions =
-                        CamelHumpMatcher::highlightingPositions(match);
                 filterEntry.extraInfo = info.extraInfo;
-                filterEntry.highlightInfo.starts = positions.starts;
-                filterEntry.highlightInfo.lengths = positions.lengths;
+                filterEntry.highlightInfo = highlightInfo(match);
 
                 if (filterEntry.displayName.startsWith(entry, caseSensitivityForPrefix))
                     bestEntries.append(filterEntry);