summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2019-09-20 07:40:51 +0200
committerDavid Schulz <david.schulz@qt.io>2019-09-20 06:59:19 +0000
commite24ef9ca0859a7c8c968f6b7c47b2fe769d5fc4b (patch)
tree1393fa646a8e609bb25b05818a00a1ad377760f6
parent194f4fca4cba5accbbbcdd22d098079cdf8b2827 (diff)
downloadqt-creator-e24ef9ca0859a7c8c968f6b7c47b2fe769d5fc4b.tar.gz
LanguageClient: always reset code assistant providers
Change-Id: Ic31eb11822b0ca1d82d0274f9b01749cebeecb2b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/languageclient/client.cpp12
1 files 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)