diff options
author | David Schulz <david.schulz@qt.io> | 2020-10-19 10:15:20 +0200 |
---|---|---|
committer | David Schulz <david.schulz@qt.io> | 2020-10-19 15:56:31 +0000 |
commit | b0d4414dfcc931b1e93ff4b814b9a9265331b1ea (patch) | |
tree | 42df24d4dda4d28cd0011a6253f23d81387fcafe | |
parent | f72c2b84f7f84a7bf2fd5886d53e2cedbfb7beb3 (diff) |
LanguageClient: pass id as a const ref when handling client messages
Change-Id: I7ab6a7517d4dd0fe66f601661e7b3f6a7afb338b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r-- | src/libs/languageserverprotocol/icontent.h | 4 | ||||
-rw-r--r-- | src/libs/languageserverprotocol/jsonrpcmessages.cpp | 4 | ||||
-rw-r--r-- | src/libs/languageserverprotocol/jsonrpcmessages.h | 4 | ||||
-rw-r--r-- | src/plugins/languageclient/client.cpp | 6 | ||||
-rw-r--r-- | src/plugins/languageclient/client.h | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/languageserverprotocol/icontent.h b/src/libs/languageserverprotocol/icontent.h index 33ef876510..e689f50072 100644 --- a/src/libs/languageserverprotocol/icontent.h +++ b/src/libs/languageserverprotocol/icontent.h @@ -90,8 +90,8 @@ public: }; using ResponseHandler = std::function<void(const QByteArray &, QTextCodec *)>; -using ResponseHandlers = std::function<void(MessageId, const QByteArray &, QTextCodec *)>; -using MethodHandler = std::function<void(const QString, MessageId, const IContent *)>; +using ResponseHandlers = std::function<void(const MessageId &, const QByteArray &, QTextCodec *)>; +using MethodHandler = std::function<void(const QString &, const MessageId &, const IContent *)>; inline uint qHash(const LanguageServerProtocol::MessageId &id) { diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.cpp b/src/libs/languageserverprotocol/jsonrpcmessages.cpp index 466477d740..e7285b8da9 100644 --- a/src/libs/languageserverprotocol/jsonrpcmessages.cpp +++ b/src/libs/languageserverprotocol/jsonrpcmessages.cpp @@ -85,8 +85,8 @@ void JsonRpcMessageHandler::registerMessageProvider( void JsonRpcMessageHandler::parseContent(const QByteArray &content, QTextCodec *codec, QString &parseError, - ResponseHandlers responseHandlers, - MethodHandler methodHandler) + const ResponseHandlers &responseHandlers, + const MethodHandler &methodHandler) { const QJsonObject &jsonObject = toJsonObject(content, codec, parseError); if (jsonObject.isEmpty()) diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.h b/src/libs/languageserverprotocol/jsonrpcmessages.h index f97ed803fc..00caab62f6 100644 --- a/src/libs/languageserverprotocol/jsonrpcmessages.h +++ b/src/libs/languageserverprotocol/jsonrpcmessages.h @@ -76,8 +76,8 @@ public: } static QByteArray jsonRpcMimeType(); static void parseContent(const QByteArray &content, QTextCodec *codec, QString &errorMessage, - ResponseHandlers responseHandlers, - MethodHandler methodHandler); + const ResponseHandlers &responseHandlers, + const MethodHandler &methodHandler); static QJsonObject toJsonObject(const QByteArray &content, QTextCodec *codec, QString &parseError); private: diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp index c238ba454a..9f237ea807 100644 --- a/src/plugins/languageclient/client.cpp +++ b/src/plugins/languageclient/client.cpp @@ -938,10 +938,10 @@ void Client::handleMessage(const BaseMessage &message) if (auto handler = m_contentHandler[message.mimeType]) { QString parseError; handler(message.content, message.codec, parseError, - [this](MessageId id, const QByteArray &content, QTextCodec *codec){ + [this](const MessageId &id, const QByteArray &content, QTextCodec *codec){ this->handleResponse(id, content, codec); }, - [this](const QString &method, MessageId id, const IContent *content){ + [this](const QString &method, const MessageId &id, const IContent *content){ this->handleMethod(method, id, content); }); if (!parseError.isEmpty()) @@ -1072,7 +1072,7 @@ void Client::handleResponse(const MessageId &id, const QByteArray &content, QTex handler(content, codec); } -void Client::handleMethod(const QString &method, MessageId id, const IContent *content) +void Client::handleMethod(const QString &method, const MessageId &id, const IContent *content) { ErrorHierarchy error; auto logError = [&](const JsonObject &content) { diff --git a/src/plugins/languageclient/client.h b/src/plugins/languageclient/client.h index d264898474..9d8d8487ce 100644 --- a/src/plugins/languageclient/client.h +++ b/src/plugins/languageclient/client.h @@ -189,7 +189,7 @@ protected: private: void handleResponse(const LanguageServerProtocol::MessageId &id, const QByteArray &content, QTextCodec *codec); - void handleMethod(const QString &method, LanguageServerProtocol::MessageId id, + void handleMethod(const QString &method, const LanguageServerProtocol::MessageId &id, const LanguageServerProtocol::IContent *content); void handleDiagnostics(const LanguageServerProtocol::PublishDiagnosticsParams ¶ms); |