diff options
author | David Schulz <david.schulz@qt.io> | 2020-02-10 10:31:32 +0100 |
---|---|---|
committer | David Schulz <david.schulz@qt.io> | 2020-02-12 11:25:01 +0000 |
commit | e3c7b7200356bdea292fd80a893940d53a231679 (patch) | |
tree | 77b831ae6cbae1d0c948d3e4248f0b705d795985 /src/plugins | |
parent | bf0f2ebea0029a82e37bb8085426330b55c6c31c (diff) | |
download | qt-creator-e3c7b7200356bdea292fd80a893940d53a231679.tar.gz |
LanguageClient: introduce new type for gorgeous formatted errors
Change-Id: Ia76bd768bcb6d33ce66319dddf8cc355a41ffa31
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/languageclient/client.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp index 50e743f71a..a55020f4d5 100644 --- a/src/plugins/languageclient/client.cpp +++ b/src/plugins/languageclient/client.cpp @@ -1054,7 +1054,7 @@ void Client::handleResponse(const MessageId &id, const QByteArray &content, QTex void Client::handleMethod(const QString &method, MessageId id, const IContent *content) { - QStringList error; + ErrorHierarchy error; bool paramsValid = true; if (method == PublishDiagnosticsNotification::methodName) { auto params = dynamic_cast<const PublishDiagnosticsNotification *>(content)->params().value_or(PublishDiagnosticsParams()); @@ -1130,9 +1130,8 @@ void Client::handleMethod(const QString &method, MessageId id, const IContent *c response.setError(error); sendContent(response); } - std::reverse(error.begin(), error.end()); if (!paramsValid) { - log(tr("Invalid parameter in \"%1\": %2").arg(method, error.join("->")), + log(tr("Invalid parameter in \"%1\": %2").arg(method, error.toString()), Core::MessageManager::Flash); } delete content; @@ -1210,11 +1209,9 @@ void Client::initializeCallback(const InitializeRequest::Response &initResponse) log(tr("No initialize result.")); } else { const InitializeResult &result = _result.value(); - QStringList error; - if (!result.isValid(&error)) { // continue on ill formed result - std::reverse(error.begin(), error.end()); - log(tr("Initialize result is not valid: ") + error.join("->")); - } + ErrorHierarchy error; + if (!result.isValid(&error)) // continue on ill formed result + log(tr("Initialize result is not valid: ") + error.toString()); m_serverCapabilities = result.capabilities().value_or(ServerCapabilities()); } |