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

LanguageClient: make typed settings backwards compatible

Browse Source 
Instead of saving the typed settings in the same list as the generic
stdio settings use a separate key. This way the new typed settings won't
get misinterpreted and overwritten by running older Qt Creator versions.

Change-Id: Ic14dfd978b5577b6ae08735bf811c21fba5ab725
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-03-05 11:56:41 +01:00
parent 30da5aafd7
commit 064da4e0cc
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,6 +79,7 @@ constexpr char executableKey[] = "executable";
constexpr char argumentsKey[] = "arguments"; constexpr char argumentsKey[] = "arguments";
constexpr char settingsGroupKey[] = "LanguageClient"; constexpr char settingsGroupKey[] = "LanguageClient";
constexpr char clientsKey[] = "clients"; constexpr char clientsKey[] = "clients";
constexpr char typedClientsKey[] = "typedClients";
constexpr char mimeType[] = "application/language.client.setting"; constexpr char mimeType[] = "application/language.client.setting";
namespace LanguageClient { namespace LanguageClient {
@@ -615,16 +616,21 @@ QList<BaseSettings *> LanguageClientSettings::fromSettings(QSettings *settingsIn
{ {
settingsIn->beginGroup(settingsGroupKey); settingsIn->beginGroup(settingsGroupKey);
QList<BaseSettings *> result; QList<BaseSettings *> result;
for (const QVariant& var : settingsIn->value(clientsKey).toList()) {
const QMap<QString, QVariant> &map = var.toMap(); for (auto varList :
Utils::Id typeId = Utils::Id::fromSetting(map.value(typeIdKey)); {settingsIn->value(clientsKey).toList(), settingsIn->value(typedClientsKey).toList()}) {
if (!typeId.isValid()) for (const QVariant &var : varList) {
typeId = Constants::LANGUAGECLIENT_STDIO_SETTINGS_ID; const QMap<QString, QVariant> &map = var.toMap();
if (BaseSettings *settings = generateSettings(typeId)) { Utils::Id typeId = Utils::Id::fromSetting(map.value(typeIdKey));
settings->fromMap(var.toMap()); if (!typeId.isValid())
result << settings; typeId = Constants::LANGUAGECLIENT_STDIO_SETTINGS_ID;
if (BaseSettings *settings = generateSettings(typeId)) {
settings->fromMap(map);
result << settings;
}
} }
} }
settingsIn->endGroup(); settingsIn->endGroup();
return result; return result;
} }
@@ -659,10 +665,16 @@ void LanguageClientSettings::toSettings(QSettings *settings,
const QList<BaseSettings *> &languageClientSettings) const QList<BaseSettings *> &languageClientSettings)
{ {
settings->beginGroup(settingsGroupKey); settings->beginGroup(settingsGroupKey);
settings->setValue(clientsKey, Utils::transform(languageClientSettings, auto transform = [](const QList<BaseSettings *> &settings) {
[](const BaseSettings *setting){ return Utils::transform(settings, [](const BaseSettings *setting) {
return QVariant(setting->toMap()); return QVariant(setting->toMap());
})); });
};
auto isStdioSetting = Utils::equal(&BaseSettings::m_settingsTypeId,
Utils::Id(Constants::LANGUAGECLIENT_STDIO_SETTINGS_ID));
auto [stdioSettings, typedSettings] = Utils::partition(languageClientSettings, isStdioSetting);
settings->setValue(clientsKey, transform(stdioSettings));
settings->setValue(typedClientsKey, transform(typedSettings));
settings->endGroup(); settings->endGroup();
} }