From dba0294b3393097d2439d5b09be734e8ec4bf484 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 9 Jul 2021 11:19:36 +0200 Subject: [PATCH] LanguageClient: fix parametersKey Change-Id: I1ec383fa38db62cc3ed5e61f3fdd526d5edb565b Reviewed-by: Christian Kandeler --- src/libs/languageserverprotocol/jsonkeys.h | 3 ++- src/libs/languageserverprotocol/jsonrpcmessages.h | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libs/languageserverprotocol/jsonkeys.h b/src/libs/languageserverprotocol/jsonkeys.h index 295ba1a89a5..b0109c11349 100644 --- a/src/libs/languageserverprotocol/jsonkeys.h +++ b/src/libs/languageserverprotocol/jsonkeys.h @@ -152,7 +152,8 @@ constexpr char onlyKey[] = "only"; constexpr char openCloseKey[] = "openClose"; constexpr char optionsKey[] = "options"; constexpr char overlappingTokenSupportKey[] = "overlappingTokenSupport"; -constexpr char parametersKey[] = "params"; +constexpr char parametersKey[] = "parameters"; +constexpr char paramsKey[] = "params"; constexpr char patternKey[] = "pattern"; constexpr char percentageKey[] = "percentage"; constexpr char placeHolderKey[] = "placeHolder"; diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.h b/src/libs/languageserverprotocol/jsonrpcmessages.h index 7a7ab2df89a..1b31e2a6565 100644 --- a/src/libs/languageserverprotocol/jsonrpcmessages.h +++ b/src/libs/languageserverprotocol/jsonrpcmessages.h @@ -104,12 +104,12 @@ public: Utils::optional params() const { - const QJsonValue ¶ms = m_jsonObject.value(parametersKey); + const QJsonValue ¶ms = m_jsonObject.value(paramsKey); return params.isUndefined() ? Utils::nullopt : Utils::make_optional(Params(params)); } void setParams(const Params ¶ms) - { m_jsonObject.insert(parametersKey, QJsonValue(params)); } - void clearParams() { m_jsonObject.remove(parametersKey); } + { m_jsonObject.insert(paramsKey, QJsonValue(params)); } + void clearParams() { m_jsonObject.remove(paramsKey); } bool isValid(QString *errorMessage) const override { @@ -149,8 +149,8 @@ public: Utils::optional params() const { return nullptr; } void setParams(const std::nullptr_t &/*params*/) - { m_jsonObject.insert(parametersKey, QJsonValue::Null); } - void clearParams() { m_jsonObject.remove(parametersKey); } + { m_jsonObject.insert(paramsKey, QJsonValue::Null); } + void clearParams() { m_jsonObject.remove(paramsKey); } bool isValid(QString *errorMessage) const override {