feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LanguageClient: Export function to restart clients for a setting

Browse Source 
Fixes: QTCREATORBUG-32015
Change-Id: I03d7e78c710a490a19a4e743389868d24ebeae84
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
This commit is contained in:
David Schulz
2024-11-18 10:41:57 +01:00
parent c231639a35
commit e6592acb52
2 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -294,7 +294,12 @@ void LanguageClientManager::applySettings()
const QList<BaseSettings *> restarts = LanguageClientSettings::changedSettings(); const QList<BaseSettings *> restarts = LanguageClientSettings::changedSettings();
LanguageClientSettings::toSettings(Core::ICore::settings(), managerInstance->m_currentSettings); LanguageClientSettings::toSettings(Core::ICore::settings(), managerInstance->m_currentSettings);
for (BaseSettings *setting : restarts) { for (BaseSettings *settings : restarts)
applySettings(settings);
}
void LanguageClientManager::applySettings(BaseSettings *setting)
{
QList<TextEditor::TextDocument *> documents; QList<TextEditor::TextDocument *> documents;
const QList<Client *> currentClients = clientsForSetting(setting); const QList<Client *> currentClients = clientsForSetting(setting);
for (Client *client : currentClients) { for (Client *client : currentClients) {
@@ -304,7 +309,7 @@ void LanguageClientManager::applySettings()
for (auto document : std::as_const(documents)) for (auto document : std::as_const(documents))
managerInstance->m_clientForDocument.remove(document); managerInstance->m_clientForDocument.remove(document);
if (!setting->isValid() || !setting->m_enabled) if (!setting->isValid() || !setting->m_enabled)
continue; return;
switch (setting->m_startBehavior) { switch (setting->m_startBehavior) {
case BaseSettings::AlwaysOn: { case BaseSettings::AlwaysOn: {
Client *client = startClient(setting); Client *client = startClient(setting);
@@ -363,7 +368,6 @@ void LanguageClientManager::applySettings()
break; break;
} }
} }
}
QList<BaseSettings *> LanguageClientManager::currentSettings() QList<BaseSettings *> LanguageClientManager::currentSettings()
{ {

1
src/plugins/languageclient/languageclientmanager.h
View File

@@ -52,6 +52,7 @@ public:
const TextEditor::TextDocument *doc, bool onlyReachable = true); const TextEditor::TextDocument *doc, bool onlyReachable = true);
static void applySettings(); static void applySettings();
static void applySettings(BaseSettings *settings);
static QList<BaseSettings *> currentSettings(); static QList<BaseSettings *> currentSettings();
static void registerClientSettings(BaseSettings *settings); static void registerClientSettings(BaseSettings *settings);
static void enableClientSettings(const QString &settingsId, bool enable = true); static void enableClientSettings(const QString &settingsId, bool enable = true);