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

LanguageClient: rename clientForSetting -> clientsForSetting

Browse Source 
Change-Id: Idf4055769fba4c2551ac968c0232ddb3916acb6c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2022-03-14 08:56:32 +01:00
parent 5924268568
commit 1a88f26d8b
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,7 +286,7 @@ void LanguageClientManager::applySettings()
for (BaseSettings *setting : restarts) { for (BaseSettings *setting : restarts) {
QList<TextEditor::TextDocument *> documents; QList<TextEditor::TextDocument *> documents;
const QList<Client *> currentClients = clientForSetting(setting); const QList<Client *> currentClients = clientsForSetting(setting);
for (Client *client : currentClients) { for (Client *client : currentClients) {
documents << managerInstance->m_clientForDocument.keys(client); documents << managerInstance->m_clientForDocument.keys(client);
shutdownClient(client); shutdownClient(client);
@@ -367,7 +367,7 @@ void LanguageClientManager::enableClientSettings(const QString &settingsId)
managerInstance->applySettings(); managerInstance->applySettings();
} }
QList<Client *> LanguageClientManager::clientForSetting(const BaseSettings *setting) QList<Client *> LanguageClientManager::clientsForSetting(const BaseSettings *setting)
{ {
QTC_ASSERT(managerInstance, return {}); QTC_ASSERT(managerInstance, return {});
auto instance = managerInstance; auto instance = managerInstance;
@@ -506,7 +506,7 @@ void LanguageClientManager::documentOpened(Core::IDocument *document)
for (BaseSettings *setting : settings) { for (BaseSettings *setting : settings) {
if (setting->isValid() && setting->m_enabled if (setting->isValid() && setting->m_enabled
&& setting->m_languageFilter.isSupported(document)) { && setting->m_languageFilter.isSupported(document)) {
QList<Client *> clients = clientForSetting(setting); QList<Client *> clients = clientsForSetting(setting);
if (setting->m_startBehavior == BaseSettings::RequiresProject) { if (setting->m_startBehavior == BaseSettings::RequiresProject) {
const Utils::FilePath &filePath = document->filePath(); const Utils::FilePath &filePath = document->filePath();
for (ProjectExplorer::Project *project : for (ProjectExplorer::Project *project :
@@ -569,7 +569,7 @@ void LanguageClientManager::updateProject(ProjectExplorer::Project *project)
if (setting->isValid() if (setting->isValid()
&& setting->m_enabled && setting->m_enabled
&& setting->m_startBehavior == BaseSettings::RequiresProject) { && setting->m_startBehavior == BaseSettings::RequiresProject) {
if (Utils::findOrDefault(clientForSetting(setting), if (Utils::findOrDefault(clientsForSetting(setting),
[project](const QPointer<Client> &client) { [project](const QPointer<Client> &client) {
return client->project() == project; return client->project() == project;
}) })

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

@@ -81,7 +81,7 @@ public:
static QList<BaseSettings *> currentSettings(); static QList<BaseSettings *> currentSettings();
static void registerClientSettings(BaseSettings *settings); static void registerClientSettings(BaseSettings *settings);
static void enableClientSettings(const QString &settingsId); static void enableClientSettings(const QString &settingsId);
static QList<Client *> clientForSetting(const BaseSettings *setting); static QList<Client *> clientsForSetting(const BaseSettings *setting);
static const BaseSettings *settingForClient(Client *setting); static const BaseSettings *settingForClient(Client *setting);
static Client *clientForDocument(TextEditor::TextDocument *document); static Client *clientForDocument(TextEditor::TextDocument *document);
static Client *clientForFilePath(const Utils::FilePath &filePath); static Client *clientForFilePath(const Utils::FilePath &filePath);

2
src/plugins/languageclient/languageclientsettings.cpp
View File

@@ -326,7 +326,7 @@ void LanguageClientSettingsPage::apply()
LanguageClientManager::applySettings(); LanguageClientManager::applySettings();
for (BaseSettings *setting : m_model.removed()) { for (BaseSettings *setting : m_model.removed()) {
for (Client *client : LanguageClientManager::clientForSetting(setting)) for (Client *client : LanguageClientManager::clientsForSetting(setting))
LanguageClientManager::shutdownClient(client); LanguageClientManager::shutdownClient(client);
} }

8
src/plugins/python/pythonlanguageclient.cpp
View File

@@ -442,7 +442,7 @@ bool PyLSSettings::applyFromSettingsWidget(QWidget *widget)
if (m_configuration != pylswidget->configuration()) { if (m_configuration != pylswidget->configuration()) {
m_configuration = pylswidget->configuration(); m_configuration = pylswidget->configuration();
if (!changed) { // if only the settings configuration changed just send an update if (!changed) { // if only the settings configuration changed just send an update
const QList<Client *> clients = LanguageClientManager::clientForSetting(this); const QList<Client *> clients = LanguageClientManager::clientsForSetting(this);
for (Client *client : clients) for (Client *client : clients)
client->updateConfiguration(configuration()); client->updateConfiguration(configuration());
} }
@@ -540,7 +540,7 @@ static Client *registerLanguageServer(const FilePath &python)
settings->m_name = PyLSConfigureAssistant::tr("Python Language Server (%1)") settings->m_name = PyLSConfigureAssistant::tr("Python Language Server (%1)")
.arg(pythonName(python)); .arg(pythonName(python));
LanguageClientManager::registerClientSettings(settings); LanguageClientManager::registerClientSettings(settings);
Client *client = LanguageClientManager::clientForSetting(settings).value(0); Client *client = LanguageClientManager::clientsForSetting(settings).value(0);
PyLSConfigureAssistant::updateEditorInfoBars(python, client); PyLSConfigureAssistant::updateEditorInfoBars(python, client);
return client; return client;
} }
@@ -663,7 +663,7 @@ static void enablePythonLanguageServer(const FilePath &python,
if (const StdIOSettings *setting = PyLSConfigureAssistant::languageServerForPython(python)) { if (const StdIOSettings *setting = PyLSConfigureAssistant::languageServerForPython(python)) {
LanguageClientManager::enableClientSettings(setting->m_id); LanguageClientManager::enableClientSettings(setting->m_id);
if (const StdIOSettings *setting = PyLSConfigureAssistant::languageServerForPython(python)) { if (const StdIOSettings *setting = PyLSConfigureAssistant::languageServerForPython(python)) {
if (Client *client = LanguageClientManager::clientForSetting(setting).value(0)) { if (Client *client = LanguageClientManager::clientsForSetting(setting).value(0)) {
LanguageClientManager::openDocumentWithClient(document, client); LanguageClientManager::openDocumentWithClient(document, client);
PyLSConfigureAssistant::updateEditorInfoBars(python, client); PyLSConfigureAssistant::updateEditorInfoBars(python, client);
} }
@@ -719,7 +719,7 @@ void PyLSConfigureAssistant::handlePyLSState(const FilePath &python,
return; return;
if (state.state == PythonLanguageServerState::AlreadyConfigured) { if (state.state == PythonLanguageServerState::AlreadyConfigured) {
if (const StdIOSettings *setting = languageServerForPython(python)) { if (const StdIOSettings *setting = languageServerForPython(python)) {
if (Client *client = LanguageClientManager::clientForSetting(setting).value(0)) if (Client *client = LanguageClientManager::clientsForSetting(setting).value(0))
LanguageClientManager::openDocumentWithClient(document, client); LanguageClientManager::openDocumentWithClient(document, client);
} }
return; return;