From 0c7883f3842b7eb6a540fff34a069032566b0bd0 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 19 Oct 2022 10:48:43 +0200 Subject: [PATCH] LSP: Fix translatable error message Change-Id: I687c58d87e75ac665aaa1817cf5ddd06382008d7 Reviewed-by: Leena Miettinen Reviewed-by: Eike Ziller Reviewed-by: --- .../languageserverprotocol/jsonrpcmessages.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.cpp b/src/libs/languageserverprotocol/jsonrpcmessages.cpp index ab15f292390..8a8311369f0 100644 --- a/src/libs/languageserverprotocol/jsonrpcmessages.cpp +++ b/src/libs/languageserverprotocol/jsonrpcmessages.cpp @@ -46,7 +46,7 @@ JsonRpcMessage::JsonRpcMessage() constexpr int utf8mib = 106; -static QString docTypeName(const QJsonDocument &doc) +static QString docType(const QJsonDocument &doc) { if (doc.isArray()) return QString("array"); @@ -73,16 +73,12 @@ JsonRpcMessage::JsonRpcMessage(const BaseMessage &message) content = message.content; QJsonParseError error = {0, QJsonParseError::NoError}; const QJsonDocument doc = QJsonDocument::fromJson(content, &error); - if (doc.isObject()) { + if (doc.isObject()) m_jsonObject = doc.object(); - } else if (doc.isNull()) { - m_parseError = tr("LanguageServerProtocol::JsonRpcMessage", - "Could not parse JSON message \"%1\".") - .arg(error.errorString()); - } else { - m_parseError = tr("Expected a JSON object, but got a JSON \"%1\" value.") - .arg(docTypeName(doc)); - } + else if (doc.isNull()) + m_parseError = tr("Could not parse JSON message \"%1\".").arg(error.errorString()); + else + m_parseError = tr("Expected a JSON object, but got a JSON \"%1\" value.").arg(docType(doc)); } JsonRpcMessage::JsonRpcMessage(const QJsonObject &jsonObject)