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

LSP: Fix translatable error message

Browse Source 
Change-Id: I687c58d87e75ac665aaa1817cf5ddd06382008d7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
David Schulz
2022-10-19 10:48:43 +02:00
parent 2f3a6fff93
commit 0c7883f384
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/languageserverprotocol/jsonrpcmessages.cpp
View File

@@ -46,7 +46,7 @@ JsonRpcMessage::JsonRpcMessage()
constexpr int utf8mib = 106; constexpr int utf8mib = 106;
static QString docTypeName(const QJsonDocument &doc) static QString docType(const QJsonDocument &doc)
{ {
if (doc.isArray()) if (doc.isArray())
return QString("array"); return QString("array");
@@ -73,16 +73,12 @@ JsonRpcMessage::JsonRpcMessage(const BaseMessage &message)
content = message.content; content = message.content;
QJsonParseError error = {0, QJsonParseError::NoError}; QJsonParseError error = {0, QJsonParseError::NoError};
const QJsonDocument doc = QJsonDocument::fromJson(content, &error); const QJsonDocument doc = QJsonDocument::fromJson(content, &error);
if (doc.isObject()) { if (doc.isObject())
m_jsonObject = doc.object(); m_jsonObject = doc.object();
} else if (doc.isNull()) { else if (doc.isNull())
m_parseError = tr("LanguageServerProtocol::JsonRpcMessage", m_parseError = tr("Could not parse JSON message \"%1\".").arg(error.errorString());
"Could not parse JSON message \"%1\".") else
.arg(error.errorString()); m_parseError = tr("Expected a JSON object, but got a JSON \"%1\" value.").arg(docType(doc));
} else {
m_parseError = tr("Expected a JSON object, but got a JSON \"%1\" value.")
.arg(docTypeName(doc));
}
} }
JsonRpcMessage::JsonRpcMessage(const QJsonObject &jsonObject) JsonRpcMessage::JsonRpcMessage(const QJsonObject &jsonObject)