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

LanguageClient: fix parametersKey

Browse Source 
Change-Id: I1ec383fa38db62cc3ed5e61f3fdd526d5edb565b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2021-07-09 11:19:36 +02:00
parent a5861b3995
commit dba0294b33
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/languageserverprotocol/jsonkeys.h
View File

@@ -152,7 +152,8 @@ constexpr char onlyKey[] = "only";
constexpr char openCloseKey[] = "openClose"; constexpr char openCloseKey[] = "openClose";
constexpr char optionsKey[] = "options"; constexpr char optionsKey[] = "options";
constexpr char overlappingTokenSupportKey[] = "overlappingTokenSupport"; constexpr char overlappingTokenSupportKey[] = "overlappingTokenSupport";
constexpr char parametersKey[] = "params"; constexpr char parametersKey[] = "parameters";
constexpr char paramsKey[] = "params";
constexpr char patternKey[] = "pattern"; constexpr char patternKey[] = "pattern";
constexpr char percentageKey[] = "percentage"; constexpr char percentageKey[] = "percentage";
constexpr char placeHolderKey[] = "placeHolder"; constexpr char placeHolderKey[] = "placeHolder";

10
src/libs/languageserverprotocol/jsonrpcmessages.h
View File

@@ -104,12 +104,12 @@ public:
Utils::optional<Params> params() const Utils::optional<Params> params() const
{ {
const QJsonValue &params = m_jsonObject.value(parametersKey); const QJsonValue &params = m_jsonObject.value(paramsKey);
return params.isUndefined() ? Utils::nullopt : Utils::make_optional(Params(params)); return params.isUndefined() ? Utils::nullopt : Utils::make_optional(Params(params));
} }
void setParams(const Params &params) void setParams(const Params &params)
{ m_jsonObject.insert(parametersKey, QJsonValue(params)); } { m_jsonObject.insert(paramsKey, QJsonValue(params)); }
void clearParams() { m_jsonObject.remove(parametersKey); } void clearParams() { m_jsonObject.remove(paramsKey); }
bool isValid(QString *errorMessage) const override bool isValid(QString *errorMessage) const override
{ {
@@ -149,8 +149,8 @@ public:
Utils::optional<std::nullptr_t> params() const Utils::optional<std::nullptr_t> params() const
{ return nullptr; } { return nullptr; }
void setParams(const std::nullptr_t &/*params*/) void setParams(const std::nullptr_t &/*params*/)
{ m_jsonObject.insert(parametersKey, QJsonValue::Null); } { m_jsonObject.insert(paramsKey, QJsonValue::Null); }
void clearParams() { m_jsonObject.remove(parametersKey); } void clearParams() { m_jsonObject.remove(paramsKey); }
bool isValid(QString *errorMessage) const override bool isValid(QString *errorMessage) const override
{ {