From 1f303ffcc51a095eee5d68a12b5779755879f6b6 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 9 Jun 2020 13:13:53 +0200 Subject: [PATCH] LSP: Port to QRegularExpression Task-number: 24098 Change-Id: Ic7efcf3bb3d268e52ac545a72e5188c5affda004 Reviewed-by: David Schulz --- src/libs/languageserverprotocol/lsptypes.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libs/languageserverprotocol/lsptypes.cpp b/src/libs/languageserverprotocol/lsptypes.cpp index 4aa9963f1a3..58016934ce2 100644 --- a/src/libs/languageserverprotocol/lsptypes.cpp +++ b/src/libs/languageserverprotocol/lsptypes.cpp @@ -370,10 +370,12 @@ bool DocumentFilter::applies(const Utils::FilePath &fileName, const Utils::MimeT return true; } if (Utils::optional _pattern = pattern()) { - QRegExp regexp(_pattern.value(), - Utils::HostOsInfo::fileNameCaseSensitivity(), - QRegExp::Wildcard); - if (regexp.exactMatch(fileName.toString())) + QRegularExpression::PatternOption option; + if (Utils::HostOsInfo::fileNameCaseSensitivity() == Qt::CaseInsensitive) + option = QRegularExpression::CaseInsensitiveOption; + QRegularExpression regexp(QRegularExpression::wildcardToRegularExpression(_pattern.value()), + option); + if (regexp.match(fileName.toString()).hasMatch()) return true; } if (Utils::optional _lang = language()) {