Rename CamelHumpMatcher -> FuzzyMatcher

Change-Id: Ia8a2eeb985bcdd500b4faf9605e5092a52dad372
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-10-30 20:50:11 +02:00
committed by Orgad Shaneh
parent fc2bb852fd
commit e9b4d3a48a
13 changed files with 48 additions and 49 deletions

View File

@@ -255,9 +255,9 @@ void GenericProposalModel::filter(const QString &prefix)
if (prefix.isEmpty())
return;
const CamelHumpMatcher::CaseSensitivity caseSensitivity =
const FuzzyMatcher::CaseSensitivity caseSensitivity =
convertCaseSensitivity(TextEditorSettings::completionSettings().m_caseSensitivity);
const QRegularExpression regExp = CamelHumpMatcher::createCamelHumpRegExp(prefix, caseSensitivity);
const QRegularExpression regExp = FuzzyMatcher::createRegExp(prefix, caseSensitivity);
m_currentItems.clear();
const QString lowerPrefix = prefix.toLower();
@@ -279,16 +279,16 @@ void GenericProposalModel::filter(const QString &prefix)
}
}
CamelHumpMatcher::CaseSensitivity
FuzzyMatcher::CaseSensitivity
GenericProposalModel::convertCaseSensitivity(TextEditor::CaseSensitivity textEditorCaseSensitivity)
{
switch (textEditorCaseSensitivity) {
case TextEditor::CaseSensitive:
return CamelHumpMatcher::CaseSensitivity::CaseSensitive;
return FuzzyMatcher::CaseSensitivity::CaseSensitive;
case TextEditor::FirstLetterCaseSensitive:
return CamelHumpMatcher::CaseSensitivity::FirstLetterCaseSensitive;
return FuzzyMatcher::CaseSensitivity::FirstLetterCaseSensitive;
default:
return CamelHumpMatcher::CaseSensitivity::CaseInsensitive;
return FuzzyMatcher::CaseSensitivity::CaseInsensitive;
}
}