Merge remote-tracking branch 'origin/4.13' into master

Conflicts:
	src/plugins/languageclient/languageclientcompletionassist.cpp

Change-Id: If12e1c532e5623ef063681309a918e7b51117b1c
This commit is contained in:
Eike Ziller
2020-09-14 10:12:14 +02:00
74 changed files with 874 additions and 137 deletions

View File

@@ -316,7 +316,7 @@ 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 at least n "identifier" characters
const QRegularExpression 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 && hasMatch(interface->textAt(m_pos - delta - 1, delta + 1)))