From d8fda051f99c5712e359fe7db351d6815c1bed95 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 2 Oct 2017 23:50:10 +0300
Subject: [PATCH] CamelHump: Minor cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use local variables to avoid duplication
* Correct the regular expression:
  instead of (?<=...)(C|(?<=...)c) create
  (?<=...)(C)|(?<=...)(c)

Change-Id: Ibf65ab118017fa67db1cb0efa4eb82a4e36f284c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/libs/utils/camelhumpmatcher.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/utils/camelhumpmatcher.cpp b/src/libs/utils/camelhumpmatcher.cpp
index cb99cff1372..51206262d44 100644
--- a/src/libs/utils/camelhumpmatcher.cpp
+++ b/src/libs/utils/camelhumpmatcher.cpp
@@ -85,16 +85,16 @@ QRegularExpression CamelHumpMatcher::createCamelHumpRegExp(
         } else if (caseSensitivity == CaseSensitivity::CaseInsensitive ||
             (caseSensitivity == CaseSensitivity::FirstLetterCaseSensitive && !first)) {
 
+            const QString upper = QRegularExpression::escape(c.toUpper());
+            const QString lower = QRegularExpression::escape(c.toLower());
             keyRegExp += "(?:";
             keyRegExp += first ? uppercaseWordFirst : uppercaseWordContinuation;
-            keyRegExp += '(' + QRegularExpression::escape(c.toUpper());
+            keyRegExp += '(' + upper + ')';
             if (first) {
-                keyRegExp += '|' + lowercaseWordFirst + QRegularExpression::escape(c.toLower()) + ')';
+                keyRegExp += '|' + lowercaseWordFirst + '(' + lower + ')';
             } else {
-                keyRegExp += ")|" + lowercaseWordContinuation;
-                keyRegExp += '(' + QRegularExpression::escape(c.toLower()) + ")|";
-                keyRegExp += upperSnakeWordContinuation;
-                keyRegExp += '(' + QRegularExpression::escape(c.toUpper()) + ')';
+                keyRegExp += '|' + lowercaseWordContinuation + '(' + lower + ')';
+                keyRegExp += '|' + upperSnakeWordContinuation + '(' + upper + ')';
             }
             keyRegExp += ')';
         } else {