diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-01-20 15:47:44 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2025-01-24 16:02:07 +0100 |
| commit | f3451d8f4692b782f884b1e39473fff074efe49e (patch) | |
| tree | 0dc8d43142fcecf43b1c752e96dcf277aea66cbf /src/qmlcompiler/qqmljsfunctioninitializer.cpp | |
| parent | 1b9d4c66ff62bb9d6dcc7c1a181788931dc26b2f (diff) | |
QmlCompiler: Do not post-process compile errors
We can determine the correct QtMsgLevel and prefix early on and set that
right away. Doing so will allow us to use the logger also for compiler
errors and remove the extra list of messages in a second step.
Task-number: QTBUG-124913
Change-Id: I145be21d0a210f07245aa19e3124634cdd4800b2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljsfunctioninitializer.cpp')
| -rw-r--r-- | src/qmlcompiler/qqmljsfunctioninitializer.cpp | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/src/qmlcompiler/qqmljsfunctioninitializer.cpp b/src/qmlcompiler/qqmljsfunctioninitializer.cpp index 95bd243f0b..a55a068729 100644 --- a/src/qmlcompiler/qqmljsfunctioninitializer.cpp +++ b/src/qmlcompiler/qqmljsfunctioninitializer.cpp @@ -59,9 +59,9 @@ void QQmlJSFunctionInitializer::populateSignature( { const auto signatureError = [&](const QString &message) { QQmlJS::DiagnosticMessage error; - error.type = QtWarningMsg; + error.type = m_logger->compileErrorLevel(); error.loc = ast->firstSourceLocation(); - error.message = message; + error.message = m_logger->compileErrorPrefix() + message; *errors << error; function->isFullyTyped = false; }; @@ -139,10 +139,14 @@ void QQmlJSFunctionInitializer::populateSignature( } static void diagnose( - const QString &message, QtMsgType type, const QQmlJS::SourceLocation &location, + const QString &message, const QQmlJS::SourceLocation &location, QQmlJSLogger *logger, QList<QQmlJS::DiagnosticMessage> *errors) { - *errors << QQmlJS::DiagnosticMessage{ message, type, location }; + *errors << QQmlJS::DiagnosticMessage { + logger->compileErrorPrefix() + message, + logger->compileErrorLevel(), + location + }; } QQmlJSCompilePass::Function QQmlJSFunctionInitializer::run( @@ -161,10 +165,20 @@ QQmlJSCompilePass::Function QQmlJSFunctionInitializer::run( m_scopeType, QQmlJSRegisterContent::InvalidLookupIndex, QQmlJSRegisterContent::ScopeObject); + // If we find a problem before we can determine whether it's a signal handler, + // that's bad and warrants a warning, even if it then turns out to be a signal handler. + const auto setIsSignalHandler = [&]() { + function.isSignalHandler = true; + + // If the function is a signal handler and just returns a closure, it's harmless. + // Otherwise it's a warning. + m_logger->setCompileErrorLevel(context->returnsClosure ? QtDebugMsg : QtWarningMsg); + }; + if (irBinding.type() != QmlIR::Binding::Type_Script) { diagnose(u"Binding is not a script binding, but %1."_s.arg( bindingTypeDescription(QmlIR::Binding::Type(quint32(irBinding.type())))), - QtDebugMsg, bindingLocation, errors); + bindingLocation, m_logger, errors); } function.isProperty = m_objectType->hasProperty(propertyName); @@ -177,16 +191,16 @@ QQmlJSCompilePass::Function QQmlJSFunctionInitializer::run( } else { diagnose(u"Cannot resolve property type %1 for binding on %2."_s .arg(property.typeName(), propertyName), - QtWarningMsg, bindingLocation, errors); + bindingLocation, m_logger, errors); } if (!property.bindable().isEmpty() && !property.isPrivate()) function.isQPropertyBinding = true; } else if (QQmlSignalNames::isHandlerName(propertyName)) { if (auto actualPropertyName = - QQmlSignalNames::changedHandlerNameToPropertyName(propertyName); - actualPropertyName && m_objectType->hasProperty(*actualPropertyName)) { - function.isSignalHandler = true; + QQmlSignalNames::changedHandlerNameToPropertyName(propertyName); + actualPropertyName && m_objectType->hasProperty(*actualPropertyName)) { + setIsSignalHandler(); } else { auto signalName = QQmlSignalNames::handlerNameToSignalName(propertyName); const auto methods = m_objectType->methods(*signalName); @@ -194,14 +208,14 @@ QQmlJSCompilePass::Function QQmlJSFunctionInitializer::run( if (method.isCloned()) continue; if (method.methodType() == QQmlJSMetaMethodType::Signal) { - function.isSignalHandler = true; + setIsSignalHandler(); const auto arguments = method.parameters(); for (qsizetype i = 0, end = arguments.size(); i < end; ++i) { const auto &type = arguments[i].type(); if (type.isNull()) { diagnose(u"Cannot resolve the argument type %1."_s.arg( arguments[i].typeName()), - QtDebugMsg, bindingLocation, errors); + bindingLocation, m_logger, errors); function.argumentTypes.append( m_typeResolver->namedType(m_typeResolver->varType())); } else { @@ -213,7 +227,7 @@ QQmlJSCompilePass::Function QQmlJSFunctionInitializer::run( } if (!function.isSignalHandler) { diagnose(u"Could not find signal \"%1\"."_s.arg(*signalName), - QtWarningMsg, bindingLocation, errors); + bindingLocation, m_logger, errors); } } } else { @@ -225,7 +239,7 @@ QQmlJSCompilePass::Function QQmlJSFunctionInitializer::run( message += u" You may want use ID-based grouped properties here."; } - diagnose(message, QtWarningMsg, bindingLocation, errors); + diagnose(message, bindingLocation, m_logger, errors); } QQmlJS::MemoryPool pool; |