aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/languageclient/languageclientcompletionassist.cpp
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2020-06-18 13:06:27 +0200
committerChristian Stenger <christian.stenger@qt.io>2020-06-19 12:48:54 +0000
commit119a3c1ce99420e578af1a10195f779d5d33a83b (patch)
treec503a321229796a4ad6494b2067b1bd7dfb13182 /src/plugins/languageclient/languageclientcompletionassist.cpp
parente817100b9cddad04c6b65c5d3985f3fe3e54ee06 (diff)
LanguageClient: Replace QRegexp by QRegularExpression
Task-number: QTCREATORBUG-24098 Change-Id: Ic8259ded3f721957bd04aa00146b20bd90b41dcd Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/languageclient/languageclientcompletionassist.cpp')
-rw-r--r--src/plugins/languageclient/languageclientcompletionassist.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/languageclient/languageclientcompletionassist.cpp b/src/plugins/languageclient/languageclientcompletionassist.cpp
index 0bccccbff6c..8a279b0dac0 100644
--- a/src/plugins/languageclient/languageclientcompletionassist.cpp
+++ b/src/plugins/languageclient/languageclientcompletionassist.cpp
@@ -40,7 +40,6 @@
#include <QDebug>
#include <QLoggingCategory>
-#include <QRegExp>
#include <QRegularExpression>
#include <QTextBlock>
#include <QTextDocument>
@@ -309,9 +308,10 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
m_pos = interface->position();
if (interface->reason() == IdleEditor) {
// Trigger an automatic completion request only when we are on a word with more than 2 "identifier" character
- const QRegExp regexp("[_a-zA-Z0-9]*");
+ const QRegularExpression regexp("[_a-zA-Z0-9]+");
+ auto hasMatch = [&regexp](const QString &txt) { return regexp.match(txt).hasMatch(); };
int delta = 0;
- while (m_pos - delta > 0 && regexp.exactMatch(interface->textAt(m_pos - delta - 1, delta + 1)))
+ while (m_pos - delta > 0 && hasMatch(interface->textAt(m_pos - delta - 1, delta + 1)))
++delta;
if (delta < 3)
return nullptr;