feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CamelHump: Minor cleanup

Browse Source 
* 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>
This commit is contained in:
Orgad Shaneh
2017-10-02 23:50:10 +03:00
committed by Orgad Shaneh
parent af63f488c2
commit d8fda051f9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/camelhumpmatcher.cpp
View File

@@ -85,16 +85,16 @@ QRegularExpression CamelHumpMatcher::createCamelHumpRegExp(
} else if (caseSensitivity == CaseSensitivity::CaseInsensitive || } else if (caseSensitivity == CaseSensitivity::CaseInsensitive ||
(caseSensitivity == CaseSensitivity::FirstLetterCaseSensitive && !first)) { (caseSensitivity == CaseSensitivity::FirstLetterCaseSensitive && !first)) {
const QString upper = QRegularExpression::escape(c.toUpper());
const QString lower = QRegularExpression::escape(c.toLower());
keyRegExp += "(?:"; keyRegExp += "(?:";
keyRegExp += first ? uppercaseWordFirst : uppercaseWordContinuation; keyRegExp += first ? uppercaseWordFirst : uppercaseWordContinuation;
keyRegExp += '(' + QRegularExpression::escape(c.toUpper()); keyRegExp += '(' + upper + ')';
if (first) { if (first) {
keyRegExp += '|' + lowercaseWordFirst + QRegularExpression::escape(c.toLower()) + ')'; keyRegExp += '|' + lowercaseWordFirst + '(' + lower + ')';
} else { } else {
keyRegExp += ")|" + lowercaseWordContinuation; keyRegExp += '|' + lowercaseWordContinuation + '(' + lower + ')';
keyRegExp += '(' + QRegularExpression::escape(c.toLower()) + ")|"; keyRegExp += '|' + upperSnakeWordContinuation + '(' + upper + ')';
keyRegExp += upperSnakeWordContinuation;
keyRegExp += '(' + QRegularExpression::escape(c.toUpper()) + ')';
} }
keyRegExp += ')'; keyRegExp += ')';
} else { } else {