From e24ef9ca0859a7c8c968f6b7c47b2fe769d5fc4b Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 20 Sep 2019 07:40:51 +0200 Subject: LanguageClient: always reset code assistant providers Change-Id: Ic31eb11822b0ca1d82d0274f9b01749cebeecb2b Reviewed-by: Christian Stenger --- src/plugins/languageclient/client.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp index 12baab3bba..a9f2d6c6e5 100644 --- a/src/plugins/languageclient/client.cpp +++ b/src/plugins/languageclient/client.cpp @@ -939,18 +939,12 @@ void Client::removeDiagnostics(const DocumentUri &uri) void Client::resetAssistProviders(TextEditor::TextDocument *document) { const AssistProviders providers = m_resetAssistProvider.take(document); - if (providers.completionAssistProvider - && document->completionAssistProvider() == m_clientProviders.completionAssistProvider) { + if (document->completionAssistProvider() == m_clientProviders.completionAssistProvider) document->setCompletionAssistProvider(providers.completionAssistProvider); - } - if (providers.functionHintProvider - && document->functionHintAssistProvider() == m_clientProviders.functionHintProvider) { + if (document->functionHintAssistProvider() == m_clientProviders.functionHintProvider) document->setFunctionHintAssistProvider(providers.functionHintProvider); - } - if (providers.quickFixAssistProvider - && document->quickFixAssistProvider() == m_clientProviders.quickFixAssistProvider) { + if (document->quickFixAssistProvider() == m_clientProviders.quickFixAssistProvider) document->setQuickFixAssistProvider(providers.quickFixAssistProvider); - } } void Client::handleResponse(const MessageId &id, const QByteArray &content, QTextCodec *codec) -- cgit v1.2.1