qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qmllint: Update JSON format to include hints into fix suggestions 

Hints are no longer their own fix suggestion but instead are part of an
existing one. This breaks compatibility with the existing format but as
the output is not documented and is versioned this should be ok.

This change will enable having multiple fix suggestions per warning in a
future change.

Pick-to: 6.10
Change-Id: Iedf275507554a2d70399757396e278999874cd53
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Olivier De Cannière 2025-08-15 14:27:35 +02:00
parent 319dea7924
commit 243883ed78
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qmlcompiler/qqmljslinter.cpp
View File

@ -471,31 +471,18 @@ static void addJsonWarning(QJsonArray &warnings, const QQmlJS::DiagnosticMessage
QJsonObject jsonFix {
{ "message"_L1, suggestion->fixDescription() },
{ "replacement"_L1, suggestion->replacement() },
{ "isHint"_L1, !suggestion->isAutoApplicable() },
{ "isAutoApplicable"_L1, suggestion->isAutoApplicable() },
{ "hint"_L1, suggestion->hint() },
};
convertLocation(suggestion->location(), &jsonFix);
const QString filename = suggestion->filename();
if (!filename.isEmpty())
jsonFix.insert("fileName"_L1, filename);
suggestions << jsonFix;
const QString hint = suggestion->hint();
if (!hint.isEmpty()) {
// We need to keep compatibility with the JSON format.
// Therefore the overly verbose encoding of the hint.
QJsonObject jsonHint {
{ "message"_L1, hint },
{ "replacement"_L1, QString() },
{ "isHint"_L1, true }
};
convertLocation(QQmlJS::SourceLocation(), &jsonHint);
suggestions << jsonHint;
}
}
jsonMessage[u"suggestions"] = suggestions;
warnings << jsonMessage;
}
void QQmlJSLinter::processMessages(QJsonArray &warnings)

2
tools/qmllint/main.cpp
View File

@ -30,7 +30,7 @@
using namespace Qt::StringLiterals;
constexpr int JSON_LOGGING_FORMAT_REVISION = 3;
constexpr int JSON_LOGGING_FORMAT_REVISION = 4;
bool argumentsFromCommandLineAndFile(QStringList& allArguments, const QStringList &arguments)
{