LanguageClient: always reset code assistant providers

Change-Id: Ic31eb11822b0ca1d82d0274f9b01749cebeecb2b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-09-20 07:40:51 +02:00
parent 194f4fca4c
commit e24ef9ca08

View File

@@ -939,18 +939,12 @@ void Client::removeDiagnostics(const DocumentUri &uri)
void Client::resetAssistProviders(TextEditor::TextDocument *document) void Client::resetAssistProviders(TextEditor::TextDocument *document)
{ {
const AssistProviders providers = m_resetAssistProvider.take(document); const AssistProviders providers = m_resetAssistProvider.take(document);
if (providers.completionAssistProvider if (document->completionAssistProvider() == m_clientProviders.completionAssistProvider)
&& document->completionAssistProvider() == m_clientProviders.completionAssistProvider) {
document->setCompletionAssistProvider(providers.completionAssistProvider); document->setCompletionAssistProvider(providers.completionAssistProvider);
} if (document->functionHintAssistProvider() == m_clientProviders.functionHintProvider)
if (providers.functionHintProvider
&& document->functionHintAssistProvider() == m_clientProviders.functionHintProvider) {
document->setFunctionHintAssistProvider(providers.functionHintProvider); document->setFunctionHintAssistProvider(providers.functionHintProvider);
} if (document->quickFixAssistProvider() == m_clientProviders.quickFixAssistProvider)
if (providers.quickFixAssistProvider
&& document->quickFixAssistProvider() == m_clientProviders.quickFixAssistProvider) {
document->setQuickFixAssistProvider(providers.quickFixAssistProvider); document->setQuickFixAssistProvider(providers.quickFixAssistProvider);
}
} }
void Client::handleResponse(const MessageId &id, const QByteArray &content, QTextCodec *codec) void Client::handleResponse(const MessageId &id, const QByteArray &content, QTextCodec *codec)