From 341234f3cfe7bde31b00a7459af852ba19172114 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 13 Aug 2021 14:40:41 +0200 Subject: [PATCH] LanguageClient: always connect client to manager The client will be either freshly created or if it was restarted disconnected in LanguageClientManager::clientFinished Change-Id: I647d0aaa918419c328013b2dc978d345f7e09c32 Reviewed-by: Eike Ziller --- .../languageclient/languageclientmanager.cpp | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp index a2ae95a1fad..025240755c4 100644 --- a/src/plugins/languageclient/languageclientmanager.cpp +++ b/src/plugins/languageclient/languageclientmanager.cpp @@ -110,23 +110,23 @@ void LanguageClientManager::clientStarted(Client *client) clientFinished(client); return; } - if (!managerInstance->m_clients.contains(client)) { + if (!managerInstance->m_clients.contains(client)) managerInstance->m_clients << client; - connect(client, &Client::finished, managerInstance, [client]() { clientFinished(client); }); - connect(client, - &Client::initialized, - managerInstance, - [client](const LanguageServerProtocol::ServerCapabilities &capabilities) { - managerInstance->m_currentDocumentLocatorFilter.updateCurrentClient(); - managerInstance->m_inspector.clientInitialized(client->name(), capabilities); - }); - connect(client, - &Client::capabilitiesChanged, - managerInstance, - [client](const DynamicCapabilities &capabilities) { - managerInstance->m_inspector.updateCapabilities(client->name(), capabilities); - }); - } + + connect(client, &Client::finished, managerInstance, [client]() { clientFinished(client); }); + connect(client, + &Client::initialized, + managerInstance, + [client](const LanguageServerProtocol::ServerCapabilities &capabilities) { + managerInstance->m_currentDocumentLocatorFilter.updateCurrentClient(); + managerInstance->m_inspector.clientInitialized(client->name(), capabilities); + }); + connect(client, + &Client::capabilitiesChanged, + managerInstance, + [client](const DynamicCapabilities &capabilities) { + managerInstance->m_inspector.updateCapabilities(client->name(), capabilities); + }); client->initialize(); }