2022-05-13 13:12:05 +00:00
|
|
|
// Copyright (C) 2022 The Qt Company Ltd.
|
|
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
2021-03-25 14:34:42 +00:00
|
|
|
|
2022-01-12 17:10:41 +00:00
|
|
|
#include <qglobal.h>
|
|
|
|
|
|
|
|
// GCC 11 thinks diagMsg.fixSuggestion.fixes.d.ptr is somehow uninitialized in
|
|
|
|
// QList::emplaceBack(), probably called from QQmlJsLogger::log()
|
|
|
|
// Ditto for GCC 12, but it emits a different warning
|
|
|
|
QT_WARNING_PUSH
|
|
|
|
QT_WARNING_DISABLE_GCC("-Wuninitialized")
|
|
|
|
QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized")
|
|
|
|
#include <qlist.h>
|
|
|
|
QT_WARNING_POP
|
|
|
|
|
2021-03-25 14:34:42 +00:00
|
|
|
#include "qqmljslogger_p.h"
|
|
|
|
|
2022-02-24 09:28:52 +00:00
|
|
|
#include <QtCore/qfile.h>
|
|
|
|
#include <QtCore/qfileinfo.h>
|
|
|
|
|
2021-11-22 12:41:14 +00:00
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
|
2022-03-21 09:21:18 +00:00
|
|
|
using namespace Qt::StringLiterals;
|
|
|
|
|
2022-05-30 12:52:03 +00:00
|
|
|
const LoggerWarningId qmlRequired { "required" };
|
2022-07-06 08:15:30 +00:00
|
|
|
const LoggerWarningId qmlAliasCycle { "alias-cycle" };
|
|
|
|
const LoggerWarningId qmlUnresolvedAlias { "unresolved-alias" };
|
2022-05-30 12:52:03 +00:00
|
|
|
const LoggerWarningId qmlImport { "import" };
|
|
|
|
const LoggerWarningId qmlRecursionDepthErrors { "recursion-depth-errors" };
|
|
|
|
const LoggerWarningId qmlWith { "with" };
|
|
|
|
const LoggerWarningId qmlInheritanceCycle { "inheritance-cycle" };
|
|
|
|
const LoggerWarningId qmlDeprecated { "deprecated" };
|
2022-07-06 08:15:30 +00:00
|
|
|
const LoggerWarningId qmlSignalParameters { "signal-handler-parameters" };
|
|
|
|
const LoggerWarningId qmlMissingType { "missing-type" };
|
|
|
|
const LoggerWarningId qmlUnresolvedType { "unresolved-type" };
|
|
|
|
const LoggerWarningId qmlRestrictedType { "restricted-type" };
|
|
|
|
const LoggerWarningId qmlPrefixedImportType { "prefixed-import-type" };
|
|
|
|
const LoggerWarningId qmlIncompatibleType { "incompatible-type" };
|
|
|
|
const LoggerWarningId qmlMissingProperty { "missing-property" };
|
|
|
|
const LoggerWarningId qmlNonListProperty { "non-list-property" };
|
|
|
|
const LoggerWarningId qmlReadOnlyProperty { "read-only-property" };
|
|
|
|
const LoggerWarningId qmlDuplicatePropertyBinding { "duplicate-property-binding" };
|
2022-05-30 12:52:03 +00:00
|
|
|
const LoggerWarningId qmlDeferredPropertyId { "deferred-property-id" };
|
|
|
|
const LoggerWarningId qmlUnqualified { "unqualified" };
|
|
|
|
const LoggerWarningId qmlUnusedImports { "unused-imports" };
|
|
|
|
const LoggerWarningId qmlMultilineStrings { "multiline-strings" };
|
|
|
|
const LoggerWarningId qmlSyntax { "syntax" };
|
|
|
|
const LoggerWarningId qmlSyntaxIdQuotation { "syntax.id-quotation" };
|
|
|
|
const LoggerWarningId qmlSyntaxDuplicateIds { "syntax.duplicate-ids" };
|
|
|
|
const LoggerWarningId qmlCompiler { "compiler" };
|
|
|
|
const LoggerWarningId qmlControlsSanity { "controls-sanity" };
|
|
|
|
const LoggerWarningId qmlAttachedPropertyReuse { "attached-property-reuse" };
|
|
|
|
const LoggerWarningId qmlPlugin { "plugin" };
|
2022-07-06 08:15:30 +00:00
|
|
|
const LoggerWarningId qmlVarUsedBeforeDeclaration { "var-used-before-declaration" };
|
|
|
|
const LoggerWarningId qmlInvalidLintDirective { "invalid-lint-directive" };
|
|
|
|
const LoggerWarningId qmlUseProperFunction { "use-proper-function" };
|
|
|
|
const LoggerWarningId qmlAccessSingleton { "access-singleton-via-object" };
|
2022-05-30 12:52:03 +00:00
|
|
|
|
|
|
|
const QList<QQmlJSLogger::Category> &QQmlJSLogger::defaultCategories()
|
|
|
|
{
|
|
|
|
static const QList<QQmlJSLogger::Category> cats = {
|
|
|
|
QQmlJSLogger::Category { qmlRequired.name().toString(), QStringLiteral("RequiredProperty"),
|
|
|
|
QStringLiteral("Warn about required properties"), QtWarningMsg },
|
2022-07-06 08:15:30 +00:00
|
|
|
QQmlJSLogger::Category { qmlAliasCycle.name().toString(),
|
|
|
|
QStringLiteral("PropertyAliasCycles"),
|
|
|
|
QStringLiteral("Warn about alias cycles"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlUnresolvedAlias.name().toString(),
|
|
|
|
QStringLiteral("PropertyAliasCycles"),
|
|
|
|
QStringLiteral("Warn about unresolved aliases"), QtWarningMsg },
|
2022-05-30 12:52:03 +00:00
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlImport.name().toString(), QStringLiteral("ImportFailure"),
|
|
|
|
QStringLiteral("Warn about failing imports and deprecated qmltypes"),
|
|
|
|
QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlRecursionDepthErrors.name().toString(), QStringLiteral("ImportFailure"),
|
|
|
|
QStringLiteral("Warn about failing imports and deprecated qmltypes"), QtWarningMsg,
|
|
|
|
false, true },
|
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlWith.name().toString(), QStringLiteral("WithStatement"),
|
|
|
|
QStringLiteral("Warn about with statements as they can cause false "
|
|
|
|
"positives when checking for unqualified access"),
|
|
|
|
QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlInheritanceCycle.name().toString(),
|
|
|
|
QStringLiteral("InheritanceCycle"),
|
|
|
|
QStringLiteral("Warn about inheritance cycles"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlDeprecated.name().toString(), QStringLiteral("Deprecated"),
|
|
|
|
QStringLiteral("Warn about deprecated properties and types"),
|
|
|
|
QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category {
|
2022-07-06 08:15:30 +00:00
|
|
|
qmlSignalParameters.name().toString(), QStringLiteral("BadSignalHandlerParameters"),
|
|
|
|
QStringLiteral("Warn about bad signal handler parameters"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlMissingType.name().toString(), QStringLiteral("MissingType"),
|
|
|
|
QStringLiteral("Warn about missing types"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlUnresolvedType.name().toString(),
|
|
|
|
QStringLiteral("UnresolvedType"),
|
|
|
|
QStringLiteral("Warn about unresolved types"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlRestrictedType.name().toString(),
|
|
|
|
QStringLiteral("RestrictedType"),
|
|
|
|
QStringLiteral("Warn about restricted types"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlPrefixedImportType.name().toString(),
|
|
|
|
QStringLiteral("PrefixedImportType"),
|
|
|
|
QStringLiteral("Warn about prefixed import types"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlIncompatibleType.name().toString(),
|
|
|
|
QStringLiteral("IncompatibleType"),
|
|
|
|
QStringLiteral("Warn about missing types"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlMissingProperty.name().toString(),
|
|
|
|
QStringLiteral("MissingProperty"),
|
|
|
|
QStringLiteral("Warn about missing properties"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlNonListProperty.name().toString(),
|
|
|
|
QStringLiteral("NonListProperty"),
|
|
|
|
QStringLiteral("Warn about non-list properties"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlReadOnlyProperty.name().toString(), QStringLiteral("ReadOnlyProperty"),
|
|
|
|
QStringLiteral("Warn about writing to read-only properties"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlDuplicatePropertyBinding.name().toString(),
|
|
|
|
QStringLiteral("DuplicatePropertyBinding"),
|
|
|
|
QStringLiteral("Warn about duplicate property bindings"),
|
|
|
|
QtWarningMsg },
|
2022-05-30 12:52:03 +00:00
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlDeferredPropertyId.name().toString(), QStringLiteral("DeferredPropertyId"),
|
|
|
|
QStringLiteral(
|
|
|
|
"Warn about making deferred properties immediate by giving them an id."),
|
|
|
|
QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlUnqualified.name().toString(), QStringLiteral("UnqualifiedAccess"),
|
|
|
|
QStringLiteral("Warn about unqualified identifiers and how to fix them"),
|
|
|
|
QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category { qmlUnusedImports.name().toString(),
|
|
|
|
QStringLiteral("UnusedImports"),
|
|
|
|
QStringLiteral("Warn about unused imports"), QtInfoMsg },
|
|
|
|
QQmlJSLogger::Category { qmlMultilineStrings.name().toString(),
|
|
|
|
QStringLiteral("MultilineStrings"),
|
|
|
|
QStringLiteral("Warn about multiline strings"), QtInfoMsg },
|
|
|
|
QQmlJSLogger::Category { qmlSyntax.name().toString(), QString(),
|
|
|
|
QStringLiteral("Syntax errors"), QtWarningMsg, false, true },
|
|
|
|
QQmlJSLogger::Category { qmlSyntaxIdQuotation.name().toString(), QString(),
|
|
|
|
QStringLiteral("ID quotation"), QtWarningMsg, false, true },
|
|
|
|
QQmlJSLogger::Category { qmlSyntaxDuplicateIds.name().toString(), QString(),
|
|
|
|
QStringLiteral("ID duplication"), QtCriticalMsg, false, true },
|
|
|
|
QQmlJSLogger::Category { qmlCompiler.name().toString(), QStringLiteral("CompilerWarnings"),
|
|
|
|
QStringLiteral("Warn about compiler issues"), QtWarningMsg, true },
|
|
|
|
|
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlControlsSanity.name().toString(), QStringLiteral("ControlsSanity"),
|
|
|
|
QStringLiteral("Performance checks used for QuickControl's implementation"),
|
|
|
|
QtCriticalMsg, true },
|
|
|
|
|
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlAttachedPropertyReuse.name().toString(), QStringLiteral("AttachedPropertyReuse"),
|
|
|
|
QStringLiteral("Warn if attached types from parent components aren't reused"),
|
|
|
|
QtCriticalMsg, true },
|
|
|
|
QQmlJSLogger::Category { qmlPlugin.name().toString(), QStringLiteral("LintPluginWarnings"),
|
|
|
|
QStringLiteral("Warn if a qmllint plugin finds an issue"),
|
2022-07-06 08:15:30 +00:00
|
|
|
QtWarningMsg, true },
|
|
|
|
QQmlJSLogger::Category { qmlVarUsedBeforeDeclaration.name().toString(),
|
|
|
|
QStringLiteral("VarUsedBeforeDeclaration"),
|
|
|
|
QStringLiteral("Warn if a variable is used before declaration"),
|
|
|
|
QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlInvalidLintDirective.name().toString(), QStringLiteral("InvalidLintDirective"),
|
|
|
|
QStringLiteral("Warn if an invalid qmllint comment is found"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlUseProperFunction.name().toString(), QStringLiteral("UseProperFunction"),
|
|
|
|
QStringLiteral("Warn if var is used for storing functions"), QtWarningMsg },
|
|
|
|
QQmlJSLogger::Category {
|
|
|
|
qmlAccessSingleton.name().toString(), QStringLiteral("AccessSingletonViaObject"),
|
|
|
|
QStringLiteral("Warn if a singleton is accessed via an object"), QtWarningMsg }
|
2021-04-19 14:54:45 +00:00
|
|
|
};
|
2021-03-30 10:58:26 +00:00
|
|
|
|
2022-05-30 12:52:03 +00:00
|
|
|
return cats;
|
2021-03-30 10:58:26 +00:00
|
|
|
}
|
|
|
|
|
2022-05-30 12:52:03 +00:00
|
|
|
const QList<QQmlJSLogger::Category> QQmlJSLogger::categories() const
|
|
|
|
{
|
|
|
|
return m_categories.values();
|
|
|
|
}
|
|
|
|
|
|
|
|
void QQmlJSLogger::registerCategory(const QQmlJSLogger::Category &category)
|
2021-03-25 14:34:42 +00:00
|
|
|
{
|
2022-05-30 12:52:03 +00:00
|
|
|
if (m_categories.contains(category.name)) {
|
|
|
|
qWarning() << "Trying to re-register existing logger category" << category.name;
|
|
|
|
return;
|
2021-03-30 10:58:26 +00:00
|
|
|
}
|
|
|
|
|
2022-05-30 12:52:03 +00:00
|
|
|
m_categoryLevels[category.name] = category.level;
|
|
|
|
m_categoryIgnored[category.name] = category.ignored;
|
|
|
|
m_categories.insert(category.name, category);
|
|
|
|
}
|
|
|
|
|
|
|
|
QQmlJSLogger::QQmlJSLogger()
|
|
|
|
{
|
|
|
|
static const QList<QQmlJSLogger::Category> cats = defaultCategories();
|
|
|
|
|
|
|
|
for (const QQmlJSLogger::Category &category : cats)
|
|
|
|
registerCategory(category);
|
2021-03-25 14:34:42 +00:00
|
|
|
|
|
|
|
// setup color output
|
|
|
|
m_output.insertMapping(QtCriticalMsg, QColorOutput::RedForeground);
|
Redesign QQmlJSLogger internals
High-level goal: be able to reuse existing infrastructure
"as is" to configure semantic analysis categories in tools
(qmllint, qmltc, qmlsc, etc.)
To achieve that, simplify the logging to always "log"
something, without explicitly specifying the severity. The
severity is now baked into the category (and we can extend
those to cover different cases)
One slight deviation is the cache generation which likes
to do its own thing at present. Provide a "forced logging"
option where we can specify which severify we want. The
hope is that this gets removed at some point
Particular list of (noteworthy) changes:
* No more "thresholding" by the level (this is rarely needed
and is actually questionable). Instead, we can ignore a
particular category explicitly
* Category levels are repurposed as category severities
(at least from the high-level picture that always should've
been this way)
* log{Warning,Info,Critical} removed. We use category severity
instead
* "category error" makes zero sense so removed: if our severity
is:
- QtWarningMsg (qmllint), it is already an "error"
- QtCriticalMsg (compilers), it is already an "error"
* Align m_output and m_{infos,warnings,errors} stored information
* Accept the fact that we don't support QtDebugMsg and QtFatalMsg
* Additional categories added to cover for places where the same
category would be both an error and not an error
Task-number: QTBUG-100052
Change-Id: I3cd5d17d58be204f48428877bed053f756ac40a8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-03 12:45:18 +00:00
|
|
|
m_output.insertMapping(QtWarningMsg, QColorOutput::PurpleForeground); // Yellow?
|
2021-03-25 14:34:42 +00:00
|
|
|
m_output.insertMapping(QtInfoMsg, QColorOutput::BlueForeground);
|
Redesign QQmlJSLogger internals
High-level goal: be able to reuse existing infrastructure
"as is" to configure semantic analysis categories in tools
(qmllint, qmltc, qmlsc, etc.)
To achieve that, simplify the logging to always "log"
something, without explicitly specifying the severity. The
severity is now baked into the category (and we can extend
those to cover different cases)
One slight deviation is the cache generation which likes
to do its own thing at present. Provide a "forced logging"
option where we can specify which severify we want. The
hope is that this gets removed at some point
Particular list of (noteworthy) changes:
* No more "thresholding" by the level (this is rarely needed
and is actually questionable). Instead, we can ignore a
particular category explicitly
* Category levels are repurposed as category severities
(at least from the high-level picture that always should've
been this way)
* log{Warning,Info,Critical} removed. We use category severity
instead
* "category error" makes zero sense so removed: if our severity
is:
- QtWarningMsg (qmllint), it is already an "error"
- QtCriticalMsg (compilers), it is already an "error"
* Align m_output and m_{infos,warnings,errors} stored information
* Accept the fact that we don't support QtDebugMsg and QtFatalMsg
* Additional categories added to cover for places where the same
category would be both an error and not an error
Task-number: QTBUG-100052
Change-Id: I3cd5d17d58be204f48428877bed053f756ac40a8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-03 12:45:18 +00:00
|
|
|
m_output.insertMapping(QtDebugMsg, QColorOutput::GreenForeground); // None?
|
2021-03-25 14:34:42 +00:00
|
|
|
}
|
|
|
|
|
2021-07-01 15:30:42 +00:00
|
|
|
static bool isMsgTypeLess(QtMsgType a, QtMsgType b)
|
2021-03-25 14:34:42 +00:00
|
|
|
{
|
2021-07-01 15:30:42 +00:00
|
|
|
static QHash<QtMsgType, int> level = { { QtDebugMsg, 0 },
|
|
|
|
{ QtInfoMsg, 1 },
|
|
|
|
{ QtWarningMsg, 2 },
|
|
|
|
{ QtCriticalMsg, 3 },
|
|
|
|
{ QtFatalMsg, 4 } };
|
|
|
|
return level[a] < level[b];
|
|
|
|
}
|
|
|
|
|
2022-05-30 12:52:03 +00:00
|
|
|
void QQmlJSLogger::log(const QString &message, LoggerWarningId id,
|
2021-07-01 15:30:42 +00:00
|
|
|
const QQmlJS::SourceLocation &srcLocation, QtMsgType type, bool showContext,
|
2022-02-24 09:28:52 +00:00
|
|
|
bool showFileName, const std::optional<FixSuggestion> &suggestion,
|
|
|
|
const QString overrideFileName)
|
2021-07-01 15:30:42 +00:00
|
|
|
{
|
2022-05-30 12:52:03 +00:00
|
|
|
Q_ASSERT(m_categoryLevels.contains(id.name().toString()));
|
|
|
|
|
|
|
|
if (isCategoryIgnored(id))
|
2021-03-25 14:34:42 +00:00
|
|
|
return;
|
|
|
|
|
Redesign QQmlJSLogger internals
High-level goal: be able to reuse existing infrastructure
"as is" to configure semantic analysis categories in tools
(qmllint, qmltc, qmlsc, etc.)
To achieve that, simplify the logging to always "log"
something, without explicitly specifying the severity. The
severity is now baked into the category (and we can extend
those to cover different cases)
One slight deviation is the cache generation which likes
to do its own thing at present. Provide a "forced logging"
option where we can specify which severify we want. The
hope is that this gets removed at some point
Particular list of (noteworthy) changes:
* No more "thresholding" by the level (this is rarely needed
and is actually questionable). Instead, we can ignore a
particular category explicitly
* Category levels are repurposed as category severities
(at least from the high-level picture that always should've
been this way)
* log{Warning,Info,Critical} removed. We use category severity
instead
* "category error" makes zero sense so removed: if our severity
is:
- QtWarningMsg (qmllint), it is already an "error"
- QtCriticalMsg (compilers), it is already an "error"
* Align m_output and m_{infos,warnings,errors} stored information
* Accept the fact that we don't support QtDebugMsg and QtFatalMsg
* Additional categories added to cover for places where the same
category would be both an error and not an error
Task-number: QTBUG-100052
Change-Id: I3cd5d17d58be204f48428877bed053f756ac40a8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-03 12:45:18 +00:00
|
|
|
// Note: assume \a type is the type we should prefer for logging
|
|
|
|
|
2022-05-30 12:52:03 +00:00
|
|
|
if (srcLocation.isValid()
|
|
|
|
&& m_ignoredWarnings[srcLocation.startLine].contains(id.name().toString()))
|
2021-05-27 12:32:43 +00:00
|
|
|
return;
|
|
|
|
|
2021-03-25 14:34:42 +00:00
|
|
|
QString prefix;
|
|
|
|
|
2022-02-24 09:28:52 +00:00
|
|
|
if ((!overrideFileName.isEmpty() || !m_fileName.isEmpty()) && showFileName)
|
|
|
|
prefix =
|
|
|
|
(!overrideFileName.isEmpty() ? overrideFileName : m_fileName) + QStringLiteral(":");
|
2021-03-25 14:34:42 +00:00
|
|
|
|
|
|
|
if (srcLocation.isValid())
|
|
|
|
prefix += QStringLiteral("%1:%2:").arg(srcLocation.startLine).arg(srcLocation.startColumn);
|
|
|
|
|
|
|
|
if (!prefix.isEmpty())
|
|
|
|
prefix.append(QLatin1Char(' '));
|
|
|
|
|
Redesign QQmlJSLogger internals
High-level goal: be able to reuse existing infrastructure
"as is" to configure semantic analysis categories in tools
(qmllint, qmltc, qmlsc, etc.)
To achieve that, simplify the logging to always "log"
something, without explicitly specifying the severity. The
severity is now baked into the category (and we can extend
those to cover different cases)
One slight deviation is the cache generation which likes
to do its own thing at present. Provide a "forced logging"
option where we can specify which severify we want. The
hope is that this gets removed at some point
Particular list of (noteworthy) changes:
* No more "thresholding" by the level (this is rarely needed
and is actually questionable). Instead, we can ignore a
particular category explicitly
* Category levels are repurposed as category severities
(at least from the high-level picture that always should've
been this way)
* log{Warning,Info,Critical} removed. We use category severity
instead
* "category error" makes zero sense so removed: if our severity
is:
- QtWarningMsg (qmllint), it is already an "error"
- QtCriticalMsg (compilers), it is already an "error"
* Align m_output and m_{infos,warnings,errors} stored information
* Accept the fact that we don't support QtDebugMsg and QtFatalMsg
* Additional categories added to cover for places where the same
category would be both an error and not an error
Task-number: QTBUG-100052
Change-Id: I3cd5d17d58be204f48428877bed053f756ac40a8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-03 12:45:18 +00:00
|
|
|
// Note: we do the clamping to [Info, Critical] range since our logger only
|
|
|
|
// supports 3 categories
|
|
|
|
type = std::clamp(type, QtInfoMsg, QtCriticalMsg, isMsgTypeLess);
|
2021-07-01 15:30:42 +00:00
|
|
|
|
Redesign QQmlJSLogger internals
High-level goal: be able to reuse existing infrastructure
"as is" to configure semantic analysis categories in tools
(qmllint, qmltc, qmlsc, etc.)
To achieve that, simplify the logging to always "log"
something, without explicitly specifying the severity. The
severity is now baked into the category (and we can extend
those to cover different cases)
One slight deviation is the cache generation which likes
to do its own thing at present. Provide a "forced logging"
option where we can specify which severify we want. The
hope is that this gets removed at some point
Particular list of (noteworthy) changes:
* No more "thresholding" by the level (this is rarely needed
and is actually questionable). Instead, we can ignore a
particular category explicitly
* Category levels are repurposed as category severities
(at least from the high-level picture that always should've
been this way)
* log{Warning,Info,Critical} removed. We use category severity
instead
* "category error" makes zero sense so removed: if our severity
is:
- QtWarningMsg (qmllint), it is already an "error"
- QtCriticalMsg (compilers), it is already an "error"
* Align m_output and m_{infos,warnings,errors} stored information
* Accept the fact that we don't support QtDebugMsg and QtFatalMsg
* Additional categories added to cover for places where the same
category would be both an error and not an error
Task-number: QTBUG-100052
Change-Id: I3cd5d17d58be204f48428877bed053f756ac40a8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-03 12:45:18 +00:00
|
|
|
// Note: since we clamped our \a type, the output message is not printed
|
|
|
|
// exactly like it was requested, bear with us
|
2022-06-30 10:48:12 +00:00
|
|
|
m_output.writePrefixedMessage(u"%1%2 [%3]"_s.arg(prefix, message, id.name().toString()), type);
|
2021-03-25 14:34:42 +00:00
|
|
|
|
2021-12-07 17:48:08 +00:00
|
|
|
Message diagMsg;
|
2021-03-25 14:34:42 +00:00
|
|
|
diagMsg.message = message;
|
2022-06-30 10:48:12 +00:00
|
|
|
diagMsg.id = id.name();
|
2021-03-25 14:34:42 +00:00
|
|
|
diagMsg.loc = srcLocation;
|
Redesign QQmlJSLogger internals
High-level goal: be able to reuse existing infrastructure
"as is" to configure semantic analysis categories in tools
(qmllint, qmltc, qmlsc, etc.)
To achieve that, simplify the logging to always "log"
something, without explicitly specifying the severity. The
severity is now baked into the category (and we can extend
those to cover different cases)
One slight deviation is the cache generation which likes
to do its own thing at present. Provide a "forced logging"
option where we can specify which severify we want. The
hope is that this gets removed at some point
Particular list of (noteworthy) changes:
* No more "thresholding" by the level (this is rarely needed
and is actually questionable). Instead, we can ignore a
particular category explicitly
* Category levels are repurposed as category severities
(at least from the high-level picture that always should've
been this way)
* log{Warning,Info,Critical} removed. We use category severity
instead
* "category error" makes zero sense so removed: if our severity
is:
- QtWarningMsg (qmllint), it is already an "error"
- QtCriticalMsg (compilers), it is already an "error"
* Align m_output and m_{infos,warnings,errors} stored information
* Accept the fact that we don't support QtDebugMsg and QtFatalMsg
* Additional categories added to cover for places where the same
category would be both an error and not an error
Task-number: QTBUG-100052
Change-Id: I3cd5d17d58be204f48428877bed053f756ac40a8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-03 12:45:18 +00:00
|
|
|
diagMsg.type = type;
|
2021-12-07 17:48:08 +00:00
|
|
|
diagMsg.fixSuggestion = suggestion;
|
2021-03-25 14:34:42 +00:00
|
|
|
|
Redesign QQmlJSLogger internals
High-level goal: be able to reuse existing infrastructure
"as is" to configure semantic analysis categories in tools
(qmllint, qmltc, qmlsc, etc.)
To achieve that, simplify the logging to always "log"
something, without explicitly specifying the severity. The
severity is now baked into the category (and we can extend
those to cover different cases)
One slight deviation is the cache generation which likes
to do its own thing at present. Provide a "forced logging"
option where we can specify which severify we want. The
hope is that this gets removed at some point
Particular list of (noteworthy) changes:
* No more "thresholding" by the level (this is rarely needed
and is actually questionable). Instead, we can ignore a
particular category explicitly
* Category levels are repurposed as category severities
(at least from the high-level picture that always should've
been this way)
* log{Warning,Info,Critical} removed. We use category severity
instead
* "category error" makes zero sense so removed: if our severity
is:
- QtWarningMsg (qmllint), it is already an "error"
- QtCriticalMsg (compilers), it is already an "error"
* Align m_output and m_{infos,warnings,errors} stored information
* Accept the fact that we don't support QtDebugMsg and QtFatalMsg
* Additional categories added to cover for places where the same
category would be both an error and not an error
Task-number: QTBUG-100052
Change-Id: I3cd5d17d58be204f48428877bed053f756ac40a8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-03 12:45:18 +00:00
|
|
|
switch (type) {
|
2021-03-25 14:34:42 +00:00
|
|
|
case QtWarningMsg: m_warnings.push_back(diagMsg); break;
|
|
|
|
case QtCriticalMsg: m_errors.push_back(diagMsg); break;
|
|
|
|
case QtInfoMsg: m_infos.push_back(diagMsg); break;
|
|
|
|
default: break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (srcLocation.isValid() && !m_code.isEmpty() && showContext)
|
2022-02-24 09:28:52 +00:00
|
|
|
printContext(overrideFileName, srcLocation);
|
2021-03-25 14:34:42 +00:00
|
|
|
|
2021-12-07 17:48:08 +00:00
|
|
|
if (suggestion.has_value())
|
|
|
|
printFix(suggestion.value());
|
2021-07-01 11:55:11 +00:00
|
|
|
}
|
|
|
|
|
2021-07-01 15:30:42 +00:00
|
|
|
void QQmlJSLogger::processMessages(const QList<QQmlJS::DiagnosticMessage> &messages,
|
2022-05-30 12:52:03 +00:00
|
|
|
LoggerWarningId id)
|
2021-03-25 14:34:42 +00:00
|
|
|
{
|
2022-05-30 12:52:03 +00:00
|
|
|
if (messages.isEmpty() || isCategoryIgnored(id))
|
2021-03-30 08:16:03 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
m_output.write(QStringLiteral("---\n"));
|
|
|
|
|
Redesign QQmlJSLogger internals
High-level goal: be able to reuse existing infrastructure
"as is" to configure semantic analysis categories in tools
(qmllint, qmltc, qmlsc, etc.)
To achieve that, simplify the logging to always "log"
something, without explicitly specifying the severity. The
severity is now baked into the category (and we can extend
those to cover different cases)
One slight deviation is the cache generation which likes
to do its own thing at present. Provide a "forced logging"
option where we can specify which severify we want. The
hope is that this gets removed at some point
Particular list of (noteworthy) changes:
* No more "thresholding" by the level (this is rarely needed
and is actually questionable). Instead, we can ignore a
particular category explicitly
* Category levels are repurposed as category severities
(at least from the high-level picture that always should've
been this way)
* log{Warning,Info,Critical} removed. We use category severity
instead
* "category error" makes zero sense so removed: if our severity
is:
- QtWarningMsg (qmllint), it is already an "error"
- QtCriticalMsg (compilers), it is already an "error"
* Align m_output and m_{infos,warnings,errors} stored information
* Accept the fact that we don't support QtDebugMsg and QtFatalMsg
* Additional categories added to cover for places where the same
category would be both an error and not an error
Task-number: QTBUG-100052
Change-Id: I3cd5d17d58be204f48428877bed053f756ac40a8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-03 12:45:18 +00:00
|
|
|
// TODO: we should instead respect message's category here (potentially, it
|
|
|
|
// should hold a category instead of type)
|
2021-03-25 14:34:42 +00:00
|
|
|
for (const QQmlJS::DiagnosticMessage &message : messages)
|
2022-05-30 12:52:03 +00:00
|
|
|
log(message.message, id, QQmlJS::SourceLocation(), false, false);
|
2021-03-30 08:16:03 +00:00
|
|
|
|
|
|
|
m_output.write(QStringLiteral("---\n\n"));
|
2021-03-25 14:34:42 +00:00
|
|
|
}
|
|
|
|
|
2022-02-24 09:28:52 +00:00
|
|
|
void QQmlJSLogger::printContext(const QString &overrideFileName,
|
|
|
|
const QQmlJS::SourceLocation &location)
|
2021-03-25 14:34:42 +00:00
|
|
|
{
|
2022-02-24 09:28:52 +00:00
|
|
|
QString code = m_code;
|
|
|
|
|
|
|
|
if (!overrideFileName.isEmpty() && overrideFileName != QFileInfo(m_fileName).absolutePath()) {
|
|
|
|
QFile file(overrideFileName);
|
|
|
|
const bool success = file.open(QFile::ReadOnly);
|
|
|
|
Q_ASSERT(success);
|
|
|
|
code = QString::fromUtf8(file.readAll());
|
|
|
|
}
|
|
|
|
|
|
|
|
IssueLocationWithContext issueLocationWithContext { code, location };
|
2021-03-25 14:34:42 +00:00
|
|
|
if (const QStringView beforeText = issueLocationWithContext.beforeText(); !beforeText.isEmpty())
|
|
|
|
m_output.write(beforeText);
|
2021-04-19 14:54:45 +00:00
|
|
|
|
|
|
|
bool locationMultiline = issueLocationWithContext.issueText().contains(QLatin1Char('\n'));
|
|
|
|
|
2021-07-05 10:48:49 +00:00
|
|
|
if (!issueLocationWithContext.issueText().isEmpty())
|
|
|
|
m_output.write(issueLocationWithContext.issueText().toString(), QtCriticalMsg);
|
2021-08-13 07:44:42 +00:00
|
|
|
m_output.write(issueLocationWithContext.afterText().toString() + QLatin1Char('\n'));
|
2021-04-19 14:54:45 +00:00
|
|
|
|
|
|
|
// Do not draw location indicator for multiline locations
|
|
|
|
if (locationMultiline)
|
|
|
|
return;
|
|
|
|
|
2021-03-25 14:34:42 +00:00
|
|
|
int tabCount = issueLocationWithContext.beforeText().count(QLatin1Char('\t'));
|
2021-07-05 10:48:49 +00:00
|
|
|
int locationLength = location.length == 0 ? 1 : location.length;
|
|
|
|
m_output.write(QString::fromLatin1(" ").repeated(issueLocationWithContext.beforeText().length()
|
|
|
|
- tabCount)
|
|
|
|
+ QString::fromLatin1("\t").repeated(tabCount)
|
|
|
|
+ QString::fromLatin1("^").repeated(locationLength) + QLatin1Char('\n'));
|
2021-03-25 14:34:42 +00:00
|
|
|
}
|
2021-07-01 11:55:11 +00:00
|
|
|
|
|
|
|
void QQmlJSLogger::printFix(const FixSuggestion &fix)
|
|
|
|
{
|
2022-02-24 09:28:52 +00:00
|
|
|
const QString currentFileAbsPath = QFileInfo(m_fileName).absolutePath();
|
|
|
|
QString code = m_code;
|
|
|
|
QString currentFile;
|
2021-07-01 11:55:11 +00:00
|
|
|
for (const auto &fixItem : fix.fixes) {
|
2021-11-23 09:39:28 +00:00
|
|
|
m_output.writePrefixedMessage(fixItem.message, QtInfoMsg);
|
2021-07-01 11:55:11 +00:00
|
|
|
|
|
|
|
if (!fixItem.cutLocation.isValid())
|
|
|
|
continue;
|
|
|
|
|
2022-02-24 09:28:52 +00:00
|
|
|
if (fixItem.fileName == currentFile) {
|
|
|
|
// Nothing to do in this case, we've already read the code
|
|
|
|
} else if (fixItem.fileName.isEmpty() || fixItem.fileName == currentFileAbsPath) {
|
|
|
|
code = m_code;
|
|
|
|
} else {
|
|
|
|
QFile file(fixItem.fileName);
|
|
|
|
const bool success = file.open(QFile::ReadOnly);
|
|
|
|
Q_ASSERT(success);
|
|
|
|
code = QString::fromUtf8(file.readAll());
|
|
|
|
currentFile = fixItem.fileName;
|
|
|
|
}
|
|
|
|
|
|
|
|
IssueLocationWithContext issueLocationWithContext { code, fixItem.cutLocation };
|
2021-07-01 11:55:11 +00:00
|
|
|
|
|
|
|
if (const QStringView beforeText = issueLocationWithContext.beforeText();
|
|
|
|
!beforeText.isEmpty()) {
|
|
|
|
m_output.write(beforeText);
|
|
|
|
}
|
|
|
|
|
2022-02-24 09:28:52 +00:00
|
|
|
// The replacement string can be empty if we're only pointing something out to the user
|
|
|
|
QStringView replacementString = fixItem.replacementString.isEmpty()
|
|
|
|
? issueLocationWithContext.issueText()
|
|
|
|
: fixItem.replacementString;
|
|
|
|
|
|
|
|
// But if there's nothing to change it has to be a hint
|
|
|
|
if (fixItem.replacementString.isEmpty())
|
|
|
|
Q_ASSERT(fixItem.isHint);
|
|
|
|
|
|
|
|
m_output.write(replacementString, QtDebugMsg);
|
2021-08-13 07:44:42 +00:00
|
|
|
m_output.write(issueLocationWithContext.afterText().toString() + u'\n');
|
2021-07-01 11:55:11 +00:00
|
|
|
|
|
|
|
int tabCount = issueLocationWithContext.beforeText().count(u'\t');
|
2022-02-25 11:15:06 +00:00
|
|
|
|
|
|
|
// Do not draw location indicator for multiline replacement strings
|
2022-02-24 09:28:52 +00:00
|
|
|
if (replacementString.contains(u'\n'))
|
2022-02-25 11:15:06 +00:00
|
|
|
continue;
|
|
|
|
|
2022-03-21 09:21:18 +00:00
|
|
|
m_output.write(u" "_s.repeated(
|
2021-07-01 11:55:11 +00:00
|
|
|
issueLocationWithContext.beforeText().length() - tabCount)
|
2022-03-21 09:21:18 +00:00
|
|
|
+ u"\t"_s.repeated(tabCount)
|
|
|
|
+ u"^"_s.repeated(fixItem.replacementString.length()) + u'\n');
|
2021-07-01 11:55:11 +00:00
|
|
|
}
|
|
|
|
}
|
2021-11-22 12:41:14 +00:00
|
|
|
|
|
|
|
QT_END_NAMESPACE
|