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>
(cherry picked from commit e6592acb52)
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
David Schulz
2024-11-18 10:41:57 +01:00
parent f74b3d7673
commit 6614e3c14d
2 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,74 +294,78 @@ 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)
QList<TextEditor::TextDocument *> documents; applySettings(settings);
const QList<Client *> currentClients = clientsForSetting(setting); }
for (Client *client : currentClients) {
documents << managerInstance->m_clientForDocument.keys(client); void LanguageClientManager::applySettings(BaseSettings *setting)
shutdownClient(client); {
QList<TextEditor::TextDocument *> documents;
const QList<Client *> currentClients = clientsForSetting(setting);
for (Client *client : currentClients) {
documents << managerInstance->m_clientForDocument.keys(client);
shutdownClient(client);
}
for (auto document : std::as_const(documents))
managerInstance->m_clientForDocument.remove(document);
if (!setting->isValid() || !setting->m_enabled)
return;
switch (setting->m_startBehavior) {
case BaseSettings::AlwaysOn: {
Client *client = startClient(setting);
for (TextEditor::TextDocument *document : std::as_const(documents))
managerInstance->m_clientForDocument[document] = client;
break;
}
case BaseSettings::RequiresFile: {
Client *client = nullptr;
for (TextEditor::TextDocument *previousDocument : std::as_const(documents)) {
if (setting->m_languageFilter.isSupported(previousDocument)) {
if (!client)
client = startClient(setting);
openDocumentWithClient(previousDocument, client);
}
} }
for (auto document : std::as_const(documents)) const QList<Core::IDocument *> &openedDocuments = Core::DocumentModel::openedDocuments();
managerInstance->m_clientForDocument.remove(document); for (Core::IDocument *document : openedDocuments) {
if (!setting->isValid() || !setting->m_enabled) if (documents.contains(document))
continue; continue; // already handled above
switch (setting->m_startBehavior) { if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(document)) {
case BaseSettings::AlwaysOn: { if (setting->m_languageFilter.isSupported(document)) {
Client *client = startClient(setting);
for (TextEditor::TextDocument *document : std::as_const(documents))
managerInstance->m_clientForDocument[document] = client;
break;
}
case BaseSettings::RequiresFile: {
Client *client = nullptr;
for (TextEditor::TextDocument *previousDocument : std::as_const(documents)) {
if (setting->m_languageFilter.isSupported(previousDocument)) {
if (!client) if (!client)
client = startClient(setting); client = startClient(setting);
openDocumentWithClient(previousDocument, client); client->openDocument(textDocument);
} }
} }
const QList<Core::IDocument *> &openedDocuments = Core::DocumentModel::openedDocuments(); }
for (Core::IDocument *document : openedDocuments) { break;
if (documents.contains(document)) }
continue; // already handled above case BaseSettings::RequiresProject: {
if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(document)) { const QList<Core::IDocument *> &openedDocuments = Core::DocumentModel::openedDocuments();
if (setting->m_languageFilter.isSupported(document)) { QHash<ProjectExplorer::Project *, Client *> clientForProject;
for (Core::IDocument *document : openedDocuments) {
auto textDocument = qobject_cast<TextEditor::TextDocument *>(document);
if (!textDocument || !setting->m_languageFilter.isSupported(textDocument))
continue;
const Utils::FilePath filePath = textDocument->filePath();
for (ProjectExplorer::Project *project :
ProjectExplorer::ProjectManager::projects()) {
if (project->isKnownFile(filePath)) {
Client *client = clientForProject[project];
if (!client) {
client = startClient(setting, project);
if (!client) if (!client)
client = startClient(setting); continue;
client->openDocument(textDocument); clientForProject[project] = client;
} }
client->openDocument(textDocument);
} }
} }
break;
}
case BaseSettings::RequiresProject: {
const QList<Core::IDocument *> &openedDocuments = Core::DocumentModel::openedDocuments();
QHash<ProjectExplorer::Project *, Client *> clientForProject;
for (Core::IDocument *document : openedDocuments) {
auto textDocument = qobject_cast<TextEditor::TextDocument *>(document);
if (!textDocument || !setting->m_languageFilter.isSupported(textDocument))
continue;
const Utils::FilePath filePath = textDocument->filePath();
for (ProjectExplorer::Project *project :
ProjectExplorer::ProjectManager::projects()) {
if (project->isKnownFile(filePath)) {
Client *client = clientForProject[project];
if (!client) {
client = startClient(setting, project);
if (!client)
continue;
clientForProject[project] = client;
}
client->openDocument(textDocument);
}
}
}
break;
}
default:
break;
} }
break;
}
default:
break;
} }
} }

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);