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

LanguageClient: do not send empty responses

Browse Source 
Even if we do not have to provide any data just send a null as the
result so the server nows that the request did not fail.

Fixes: QTCREATORBUG-26116
Change-Id: I9b965389bb197cdd81d0d3ffbac05f289cabda40
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2021-08-13 14:55:22 +02:00
parent 99700bb009
commit 67a86b72b7
2 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,7 +236,7 @@ public:
Utils::optional<Result> result() const
{
const QJsonValue &result = m_jsonObject.value("result");
const QJsonValue &result = m_jsonObject.value(resultKey);
if (result.isUndefined())
return Utils::nullopt;
return Utils::make_optional(Result(result));
@@ -259,6 +259,41 @@ public:
{ return JsonRpcMessage::isValid(errorMessage) && id().isValid(); }
};
template<typename ErrorDataType>
class Response<std::nullptr_t, ErrorDataType> : public JsonRpcMessage
{
public:
explicit Response(const MessageId &id) { setId(id); }
using JsonRpcMessage::JsonRpcMessage;
MessageId id() const
{ return MessageId(m_jsonObject.value(idKey)); }
void setId(MessageId id)
{ this->m_jsonObject.insert(idKey, id); }
Utils::optional<std::nullptr_t> result() const
{
return m_jsonObject.value(resultKey).isNull() ? Utils::make_optional(nullptr)
: Utils::nullopt;
}
void setResult(const std::nullptr_t &) { m_jsonObject.insert(resultKey, QJsonValue::Null); }
void clearResult() { m_jsonObject.remove(resultKey); }
using Error = ResponseError<ErrorDataType>;
Utils::optional<Error> error() const
{
const QJsonValue &val = m_jsonObject.value(errorKey);
return val.isUndefined() ? Utils::nullopt
: Utils::make_optional(fromJsonValue<Error>(val));
}
void setError(const Error &error)
{ m_jsonObject.insert(errorKey, QJsonValue(error)); }
void clearError() { m_jsonObject.remove(errorKey); }
bool isValid(QString *errorMessage) const override
{ return JsonRpcMessage::isValid(errorMessage) && id().isValid(); }
};
template <typename Result, typename ErrorDataType, typename Params>
class Request : public Notification<Params>
{

6
src/plugins/languageclient/client.cpp
View File

@@ -1293,8 +1293,10 @@ void Client::handleMethod(const QString &method, const MessageId &id, const ICon
response.setResult(result);
sendContent(response);
} else if (method == WorkDoneProgressCreateRequest::methodName) {
sendContent(WorkDoneProgressCreateRequest::Response(
dynamic_cast<const WorkDoneProgressCreateRequest *>(content)->id()));
WorkDoneProgressCreateRequest::Response response(
dynamic_cast<const WorkDoneProgressCreateRequest *>(content)->id());
response.setResult(nullptr);
sendContent(response);
} else if (method == ProgressNotification::methodName) {
if (Utils::optional<ProgressParams> params
= dynamic_cast<const ProgressNotification *>(content)->params()) {