From 2b54ef80d18f84e628ae0c38c8f67dee1c059f18 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 12 May 2023 16:22:04 +0200 Subject: LocatorFilters: Use ILocatorFilter::createRegExp() consistently Use it consistently inside ILocatorFilter subclasses, instead of FuzzyMatcher. Drop repeated default arguments from the caller. Change-Id: I53762f27216a30ed0281f3d0ddc5e50c7452559a Reviewed-by: Eike Ziller --- src/plugins/cppeditor/cpplocatorfilter.cpp | 2 +- src/plugins/languageclient/locatorfilter.cpp | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/plugins/cppeditor/cpplocatorfilter.cpp b/src/plugins/cppeditor/cpplocatorfilter.cpp index 4e78d8130f..5f0904dd03 100644 --- a/src/plugins/cppeditor/cpplocatorfilter.cpp +++ b/src/plugins/cppeditor/cpplocatorfilter.cpp @@ -203,7 +203,7 @@ void matchesForCurrentDocument(QPromise &promise, const LocatorStorage &st const FilePath ¤tFileName) { const QString input = storage.input(); - const QRegularExpression regexp = FuzzyMatcher::createRegExp(input, Qt::CaseInsensitive, false); + const QRegularExpression regexp = ILocatorFilter::createRegExp(input); if (!regexp.isValid()) return; diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp index 7ac85c165b..5d52f28f23 100644 --- a/src/plugins/languageclient/locatorfilter.cpp +++ b/src/plugins/languageclient/locatorfilter.cpp @@ -293,11 +293,8 @@ Core::LocatorFilterEntries currentDocumentSymbols(const QString &input, const CurrentDocumentSymbolsData ¤tSymbolsData, const DocSymbolModifier &docSymbolModifier) { - const FuzzyMatcher::CaseSensitivity caseSensitivity - = ILocatorFilter::caseSensitivity(input) == Qt::CaseSensitive - ? FuzzyMatcher::CaseSensitivity::CaseSensitive - : FuzzyMatcher::CaseSensitivity::CaseInsensitive; - const QRegularExpression regExp = FuzzyMatcher::createRegExp(input, caseSensitivity); + const Qt::CaseSensitivity caseSensitivity = ILocatorFilter::caseSensitivity(input); + const QRegularExpression regExp = ILocatorFilter::createRegExp(input, caseSensitivity); if (!regExp.isValid()) return {}; -- cgit v1.2.1