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

LSP: define a MessageId invalid if it contains an empty string

Browse Source 
Change-Id: I90852b4f17a465d562cb402b46de5266aeba9b28
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
David Schulz
2022-07-07 16:23:28 +02:00
parent 99c8706a95
commit 457c88343f
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,17 +48,15 @@ class JsonRpcMessage;
class LANGUAGESERVERPROTOCOL_EXPORT MessageId : public Utils::variant<int, QString> class LANGUAGESERVERPROTOCOL_EXPORT MessageId : public Utils::variant<int, QString>
{ {
public: public:
MessageId() = default; MessageId() : variant(QString()) {}
explicit MessageId(int id) : variant(id) {} explicit MessageId(int id) : variant(id) {}
explicit MessageId(const QString &id) : variant(id) {} explicit MessageId(const QString &id) : variant(id) {}
explicit MessageId(const QJsonValue &value) explicit MessageId(const QJsonValue &value)
{ {
if (value.isDouble()) if (value.isDouble())
*this = MessageId(value.toInt()); emplace<int>(value.toInt());
else if (value.isString())
*this = MessageId(value.toString());
else else
m_valid = false; emplace<QString>(value.toString());
} }
operator QJsonValue() const operator QJsonValue() const
@@ -70,7 +68,14 @@ public:
return QJsonValue(); return QJsonValue();
} }
bool isValid() const { return m_valid; } bool isValid() const
{
if (Utils::holds_alternative<int>(*this))
return true;
const QString *id = Utils::get_if<QString>(this);
QTC_ASSERT(id, return false);
return !id->isEmpty();
}
QString toString() const QString toString() const
{ {
@@ -89,9 +94,6 @@ public:
return QT_PREPEND_NAMESPACE(qHash(Utils::get<QString>(id))); return QT_PREPEND_NAMESPACE(qHash(Utils::get<QString>(id)));
return QT_PREPEND_NAMESPACE(qHash(0)); return QT_PREPEND_NAMESPACE(qHash(0));
} }
private:
bool m_valid = true;
}; };
template <typename Error> template <typename Error>