Merge remote-tracking branch 'origin/4.14'

Change-Id: I516e87eed1b716ec085095c9dd4f47f04a99de7c
This commit is contained in:
Eike Ziller
2021-01-25 09:06:36 +01:00
21 changed files with 229 additions and 37 deletions

View File

@@ -451,10 +451,12 @@ bool LanguageClientCompletionAssistProvider::isActivationCharSequence(const QStr
});
}
void LanguageClientCompletionAssistProvider::setTriggerCharacters(QList<QString> triggerChars)
void LanguageClientCompletionAssistProvider::setTriggerCharacters(
const Utils::optional<QList<QString>> triggerChars)
{
m_triggerChars = triggerChars;
for (const QString &trigger : triggerChars) {
m_activationCharSequenceLength = 0;
m_triggerChars = triggerChars.value_or(QList<QString>());
for (const QString &trigger : qAsConst(m_triggerChars)) {
if (trigger.length() > m_activationCharSequenceLength)
m_activationCharSequenceLength = trigger.length();
}