qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/auto/qml/qqmljsscope/tst_qqmljsscope.cpp

993 lines
40 KiB
C++
Raw Normal View History

Use SPDX license identifiers Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2022-05-13 13:12:05 +00:00
// Copyright (C) 2021 The Qt Company Ltd.
Correct license for test files According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I26d72e8de04d4c7c57b3b7838af5d033265de5ba Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2024-02-22 14:51:16 +00:00
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
#include <QtTest/QtTest>
#include <QtQuickTestUtils/private/qmlutils_p.h>
#include <QtCore/qfileinfo.h>
#include <QtCore/qdir.h>
#include <QtCore/qdiriterator.h>
#include <QtCore/qurl.h>
#include <QtCore/qlibraryinfo.h>
tst_qqmljsscope: Cover a more sophisticated group property case Document (via test) what happens when we re-assign a group property in the derived scope Introduce a QML test module along the way used within the test As a drive by, add all QML test files to TESTDATA Change-Id: Id4c3e20e45b8e0f3757840c87e0285f8516319a8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-03-30 10:50:46 +00:00
#include <QtCore/qscopedpointer.h>
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
#include <QtQml/qqmlengine.h>
#include <QtQml/qqmlcomponent.h>
tst_qqmljsscope: Cover a more sophisticated group property case Document (via test) what happens when we re-assign a group property in the derived scope Introduce a QML test module along the way used within the test As a drive by, add all QML test files to TESTDATA Change-Id: Id4c3e20e45b8e0f3757840c87e0285f8516319a8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-03-30 10:50:46 +00:00
#include <QtGui/qfont.h>
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
#include <QtQml/private/qqmlirbuilder_p.h>
#include <private/qqmljscompiler_p.h>
#include <private/qqmljsscope_p.h>
#include <private/qqmljsimporter_p.h>
#include <private/qqmljslogger_p.h>
#include <private/qqmljsimportvisitor_p.h>
#include <private/qqmljstyperesolver_p.h>
qmlcompiler: Improve grouped property support Still lacks support for merging and resolving grouped bindings, but this will be handled in another patch. Task-number: QTBUG-100168 Original-patch-by: Fabian Kosmale <fabian.kosmale@qt.io> Change-Id: I1bb73f383acc3c8512676db47c5944f369b904b7 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-18 13:16:09 +00:00
#include <QtQml/private/qqmljslexer_p.h>
#include <QtQml/private/qqmljsparser_p.h>
qqmltypecompiler: align runtime function table order to qmlcachegen When we write runtime functions to compilation unit at run time, the order of the functions in the unit (often) differs from the order of functions in the unit produced ahead of time by qmlcachegen and friends. Additionally, the order also differs from what qmltc expects (and qmlcompiler library in general) Fix the order by simplifying the procedure of JS code generation when we create the compilation unit at run time: new logic just goes over the objects in the document linearly, instead of relying on bindings (which are known to be out of order w.r.t. AST) Change-Id: I4070b9d061f03c4c76d03120654ad3f30725493a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-01 11:51:12 +00:00
#include <private/qqmlcomponent_p.h>
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
using namespace Qt::StringLiterals;
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
class tst_qqmljsscope : public QQmlDataTest
{
Q_OBJECT
QString loadUrl(const QString &url)
{
const QFileInfo fi(url);
QFile f(fi.absoluteFilePath());
Tests: check that QFile::open succeeds Wrap it in QVERIFY if possible. If not possible (e.g. a function that returns non-void, or not an autotest function) use qFatal to abort the test. Change-Id: Ie255024d29507e928a94e67d9af1cd436df4f1df Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2024-03-23 19:41:57 +00:00
if (!f.open(QIODevice::ReadOnly))
qFatal("Could not open file %s", qPrintable(url));
QByteArray data = f.readAll();
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
return QString::fromUtf8(data);
}
QQmlJSImportVisitor: do not register group { ... } as an object scope Grouped properties do not bind to a default property and they are not object definition scopes. Fix the subtle issue where we'd do the opposite for `group { ... }` syntax Submit the tst_qqmljsscope changes that made the issue visible Pick-to: 6.3 Change-Id: I314b19d5cad62f70146d228e5402c9fc73b309ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-04 10:35:58 +00:00
QQmlJSScope::ConstPtr run(QString url, bool expectErrorsOrWarnings = false)
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
{
QmlIR::Document document(false);
QQmlJSImportVisitor: do not register group { ... } as an object scope Grouped properties do not bind to a default property and they are not object definition scopes. Fix the subtle issue where we'd do the opposite for `group { ... }` syntax Submit the tst_qqmljsscope changes that made the issue visible Pick-to: 6.3 Change-Id: I314b19d5cad62f70146d228e5402c9fc73b309ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-04 10:35:58 +00:00
return run(url, &document, expectErrorsOrWarnings);
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
}
QQmlJSImportVisitor: do not register group { ... } as an object scope Grouped properties do not bind to a default property and they are not object definition scopes. Fix the subtle issue where we'd do the opposite for `group { ... }` syntax Submit the tst_qqmljsscope changes that made the issue visible Pick-to: 6.3 Change-Id: I314b19d5cad62f70146d228e5402c9fc73b309ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-04 10:35:58 +00:00
QQmlJSScope::ConstPtr run(QString url, QmlIR::Document *document,
bool expectErrorsOrWarnings = false)
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
{
url = testFile(url);
const QString sourceCode = loadUrl(url);
if (sourceCode.isEmpty())
return QQmlJSScope::ConstPtr();
// NB: JS unit generated here is ignored, so use noop function
QQmlJSSaveFunction noop([](auto &&...) { return true; });
QQmlJSCompileError error;
[&]() {
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
QVERIFY2(qCompileQmlFile(*document, url, noop, nullptr, &error),
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
qPrintable(error.message));
}();
if (!error.message.isEmpty())
return QQmlJSScope::ConstPtr();
Add a default implementation for QQmlJSAotCompiler The default AOT compiler compiles QML code in indirect, dynamic mode. It uses the logger's Log_Compiler category to determine the verbosity of its output. In addition you can use the qt.qml.compiler.aot category for even more verbosity. In preparation for using QQmlJSAotCompiler with qmlcachegen, the default level of that category is increased to QtFatalMsg. The highest level we actually output is QtDebugMsg, so it doesn't make a difference yet. If the logger's Log_Compiler category is set to produce errors, it will qFatal() on "pragma Strict" violations. Change-Id: Ieb74bfa7cd51cfa8616792ab467c32f6ba0e0702 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-18 13:26:29 +00:00
QQmlJSLogger logger;
logger.setFileName(url);
logger.setCode(sourceCode);
QQmlJSImportVisitor: do not register group { ... } as an object scope Grouped properties do not bind to a default property and they are not object definition scopes. Fix the subtle issue where we'd do the opposite for `group { ... }` syntax Submit the tst_qqmljsscope changes that made the issue visible Pick-to: 6.3 Change-Id: I314b19d5cad62f70146d228e5402c9fc73b309ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-04 10:35:58 +00:00
logger.setSilent(expectErrorsOrWarnings);
Avoid copying QQmlJSScope The factory should populate the pre-existing scope rather than copy it into place. This way we can detect inheritance cycles involving the pre-existing scope. However, now we may detect the inheritance cycles earlier, when resolving the types inside the lazy loading. We have the right pointers available there now, after all. Therefore, add a way to propagate base type errors out of the factory. When clearing the base type, we can now give a reason for that. When checking the inheritance cycles we retrieve that reason and log it. We also remove the special casing of the ScopeType property of QQmlJSScope. There is no real reason to set it in the ctor. As we delay the population of QQmlJSScope now, we have to set it later. Pick-to: 6.2 6.3 Task-number: QTBUG-102153 Change-Id: I49cf6e20f59fbdb6ed98a82040b3b159676f5975 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-31 09:26:09 +00:00
QQmlJSScope::Ptr target = QQmlJSScope::create();
qqmljsscope: add ownModuleName Allow qqmljsscopes of QML components to have "own" module names, and add a helper method moduleName() that helps retrieve the module name of some (possibly non QML component) qqmljsscope by iterating over its parents. That is required for the renaming of qmlcomponents and allows to check if the qml element to be renamed is defined in the same module as the current module. (It is not allowed to rename a QML component from another module). Task-number: QTBUG-114993 Change-Id: I09d57ec87cfc64de31859b2af6334264c4fa6912 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
2024-04-05 09:04:22 +00:00
target->setOwnModuleName(u"HelloModule"_s);
Avoid copying QQmlJSScope The factory should populate the pre-existing scope rather than copy it into place. This way we can detect inheritance cycles involving the pre-existing scope. However, now we may detect the inheritance cycles earlier, when resolving the types inside the lazy loading. We have the right pointers available there now, after all. Therefore, add a way to propagate base type errors out of the factory. When clearing the base type, we can now give a reason for that. When checking the inheritance cycles we retrieve that reason and log it. We also remove the special casing of the ScopeType property of QQmlJSScope. There is no real reason to set it in the ctor. As we delay the population of QQmlJSScope now, we have to set it later. Pick-to: 6.2 6.3 Task-number: QTBUG-102153 Change-Id: I49cf6e20f59fbdb6ed98a82040b3b159676f5975 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-31 09:26:09 +00:00
QQmlJSImportVisitor visitor(target, &m_importer, &logger, dataDirectory());
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
QQmlJSTypeResolver typeResolver { &m_importer };
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
typeResolver.init(&visitor, document->program);
QQmlJSImportVisitor: do not register group { ... } as an object scope Grouped properties do not bind to a default property and they are not object definition scopes. Fix the subtle issue where we'd do the opposite for `group { ... }` syntax Submit the tst_qqmljsscope changes that made the issue visible Pick-to: 6.3 Change-Id: I314b19d5cad62f70146d228e5402c9fc73b309ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-04 10:35:58 +00:00
if (!expectErrorsOrWarnings) {
[&]() {
QVERIFY2(!logger.hasWarnings(), "Expected no warnings in this test");
QVERIFY2(!logger.hasErrors(), "Expected no errors in this test");
}();
}
if (QTest::currentTestFailed())
return QQmlJSScope::ConstPtr();
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
return visitor.result();
}
private Q_SLOTS:
void initTestCase() override;
void orderedBindings();
Distinguish property change signals from user-defined signals Do not expose this information to qmltypes just yet, though, as this seems irrelevant at the moment Pick-to: 6.3 Change-Id: Iffd8901ef9899a0fff226e8799bf45c1d688b92b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-01-27 14:02:00 +00:00
void signalCreationDifferences();
QmlCompiler: Discern between internal and anonymous imports Anonymous imports are imports of QML types that aren't visible in the current document. Internal imports are imports of C++ types, also invisible, but potentially of the same names. Before, types with exports were added to the qmltypes container using their exports if any matched. If there were no exports, we constructed a synthetic name and inserted that. However, as the nullptr example shows, we need a reliable way to find them by their internal names, no matter if exports are present. Therefore, we now consistently add them by their internal names using the new $internal$ prefix. Change-Id: I42ac2447cd924d09970c24554e1e2a5e631c5f79 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-02-03 13:39:58 +00:00
void allTypesAvailable();
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
void shadowing();
QQmlJSImportVisitor mark required aliases as required in their scope When `QQmlJSImportVisitor` visits a program, it marks properties as required in their scope when it encounters them or it encounters a `required` statement. For aliases, an additional step is performed at the end of a visit, when the aliases are resolved. After an alias is resolved to a target property, is "requiredness", is set based on the required of the target property in its scope. Due to the specific implementation, the alias will be set to required in its scope if the target property is required in its scope and will be set to be non-required otherwise, independently of its previous required state. When we have an alias that is itself required pointing to a property that isn't required, for example: ``` Item { id: self property int foo property alias alias: self.foo required alias } ``` The alias will always be marked as not required, as it always inherits the required state of the target property, losing the required status that was applied by the "required" statement. To respect "required" statements in relation to aliases, `QQmlJSImportVisitor::resolveAliasesAndIds` will now inherit the "requiredness" of the target property only when the alias is not already marked as required in its scope. Fixes: QTBUG-123837 Change-Id: I7b0f6958287625f3f3a5d736d4c45a3e050d4502 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2024-03-29 10:52:43 +00:00
void requiredAlias();
qmlcompiler: Improve grouped property support Still lacks support for merging and resolving grouped bindings, but this will be handled in another patch. Task-number: QTBUG-100168 Original-patch-by: Fabian Kosmale <fabian.kosmale@qt.io> Change-Id: I1bb73f383acc3c8512676db47c5944f369b904b7 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-18 13:16:09 +00:00
Rework QQmlJSScope::causesImplicitComponentWrapping() It does not seem correct to be able to use this function for both sides of binding expressions: the property type and the assigned QML type (`<property> : <qml type> {}`). Instead, it should really be a function that considers both sides together (and actually checks the sides differently!) What we really should do for the assigned QML type is figure whether its *first* non-composite base is a QQmlComponent - not just that it is a QQmlComponent itself. Leave the QQmlAbstractDelegateComponent check in place since this part is correct The property itself, on the other hand, seems to cause an implicit component wrapping if its type is QQmlComponent-derived (which means we have to check the full C++ hierarchy) As a drive by, also update QQmlJSScope::canAssign() since it used the old function internally and was ignoring the case when a to-be-assigned type lacks a C++ base type hierarchy (e.g. because it does not exist ahead of time) Pick-to: 6.3 Change-Id: I23524fa54d45d9140e1cafd9f81ef1f68d95f3a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-15 15:43:38 +00:00
#ifdef LABS_QML_MODELS_PRESENT
void componentWrappedObjects();
Add QmlModels dependency to LabsQmlModels Some classes (e.g. QQmlDelegateChooser) depend-on / inherit QmlModels' functionality. We need to propagate that dependency to QML via qmldir entry, otherwise we won't be able to see the types in QmlCompiler lib Note that we already depend more strongly (via linking) on the QmlModels library, so there is no reason not to depend on the QML module in qmldir Pick-to: 6.2 6.3 Change-Id: I4f16f66f2910fb6afd38475cd6ba3209cfd1207d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-28 11:45:35 +00:00
void labsQmlModelsSanity();
Rework QQmlJSScope::causesImplicitComponentWrapping() It does not seem correct to be able to use this function for both sides of binding expressions: the property type and the assigned QML type (`<property> : <qml type> {}`). Instead, it should really be a function that considers both sides together (and actually checks the sides differently!) What we really should do for the assigned QML type is figure whether its *first* non-composite base is a QQmlComponent - not just that it is a QQmlComponent itself. Leave the QQmlAbstractDelegateComponent check in place since this part is correct The property itself, on the other hand, seems to cause an implicit component wrapping if its type is QQmlComponent-derived (which means we have to check the full C++ hierarchy) As a drive by, also update QQmlJSScope::canAssign() since it used the old function internally and was ignoring the case when a to-be-assigned type lacks a C++ base type hierarchy (e.g. because it does not exist ahead of time) Pick-to: 6.3 Change-Id: I23524fa54d45d9140e1cafd9f81ef1f68d95f3a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-15 15:43:38 +00:00
#endif
void unknownCppBase();
qmlcompiler: Improve grouped property support Still lacks support for merging and resolving grouped bindings, but this will be handled in another patch. Task-number: QTBUG-100168 Original-patch-by: Fabian Kosmale <fabian.kosmale@qt.io> Change-Id: I1bb73f383acc3c8512676db47c5944f369b904b7 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-18 13:16:09 +00:00
void groupedProperties();
QmlCompiler: Allow retrieval of descriptive name from invalid types Apparently we do that somewhere. It should not just crash. Pick-to: 6.2 6.3 Task-number: QTBUG-102147 Change-Id: Id612e0543d8794aa4f334a899b117142b7a8cd38 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-04-06 09:52:25 +00:00
void descriptiveNameOfNull();
tst_qqmljsscope: Cover a more sophisticated group property case Document (via test) what happens when we re-assign a group property in the derived scope Introduce a QML test module along the way used within the test As a drive by, add all QML test files to TESTDATA Change-Id: Id4c3e20e45b8e0f3757840c87e0285f8516319a8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-03-30 10:50:46 +00:00
void groupedPropertiesConsistency();
qmlcompiler: Create group binding in group property syntax case Cover the following case of binding on a group property: Type { group { foo: 42 } } Task-number: QTBUG-100168 Change-Id: I0147c74dffb649907457d5f17a2ab29473101a6d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 12:15:32 +00:00
void groupedPropertySyntax();
qmlcompiler: Support attached property bindings Extend group property binding creation with attached properties case As a drive by, add extra attached property tests for QML and qmltc, covering the case where an attaching type exists in both base and derived types Task-number: QTBUG-102082 Change-Id: I6c0d2b941da72d6dab7fc05a4f7b2a7875423ef0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 15:16:11 +00:00
void attachedProperties();
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
void scriptIndices();
Fix extension lookup in QQmlJSScope Do not go over extension's base types since this is not how the engine logic work. Instead, only assess the direct extension type when traversing the base type hierarchy. The special cases are value types which still need base type extension traversal (e.g. due to Number and NumberPrototype extensions on primitives) and QObject type itself (we expect to see ObjectPrototype properties / methods of it) Pick-to: 6.3 6.2 Change-Id: I92ba979202b33f16e1a7b948d4f1e79df37f2669 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-03 15:08:37 +00:00
void extensions();
qqmljsimportvisitor: Fix assert being hit on empty block bindings We previously hit an assert / crashed if we saw an empty script binding. Fixes: QTBUG-103707 Change-Id: I117d984a7d315ecf860d2ada5568637d154ae083 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-05-19 13:41:24 +00:00
void emptyBlockBinding();
qqmljsscope: add ownEnumerationKey() helper method Add a method to find own enumeration keys to qqmljsscope, and also tests for it. Change-Id: Ic40d390dc794c7c2f9eb94b14bf653e3411a1423 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2024-01-24 17:48:38 +00:00
void hasOwnEnumerationKeys();
qqmljsscope: add ownModuleName Allow qqmljsscopes of QML components to have "own" module names, and add a helper method moduleName() that helps retrieve the module name of some (possibly non QML component) qqmljsscope by iterating over its parents. That is required for the renaming of qmlcomponents and allows to check if the qml element to be renamed is defined in the same module as the current module. (It is not allowed to rename a QML component from another module). Task-number: QTBUG-114993 Change-Id: I09d57ec87cfc64de31859b2af6334264c4fa6912 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
2024-04-05 09:04:22 +00:00
void ownModuleName();
Set bindings on QQmlJSScope after AST traversal We can get into situations when binding creation is problematic due to the relevant scopes being yet unresolved. In particular, this happens when processing attached/group properties script bindings Avoid having this situation by postponing the actual binding setting until after the relavant scopes are resolved (mainly, the binding owner). However, do relevant AST order dependent operations beforehand to avoid accidental errors This commit amends 25098b7a4fdb8920874a817956f659e6393548d2 Fixes: QTBUG-103897 Change-Id: I671955dbe321d03e5f1ab9891cc79dc0a936deda Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 13:18:56 +00:00
void resolvedNonUniqueScopes();
qqmltypecompiler: align runtime function table order to qmlcachegen When we write runtime functions to compilation unit at run time, the order of the functions in the unit (often) differs from the order of functions in the unit produced ahead of time by qmlcachegen and friends. Additionally, the order also differs from what qmltc expects (and qmlcompiler library in general) Fix the order by simplifying the procedure of JS code generation when we create the compilation unit at run time: new logic just goes over the objects in the document linearly, instead of relying on bindings (which are known to be out of order w.r.t. AST) Change-Id: I4070b9d061f03c4c76d03120654ad3f30725493a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-01 11:51:12 +00:00
void compilationUnitsAreCompatible();
QQmlSA: Change API for accessing attached types An Element no longer exposes its attached type directly. Instead, the function resolveAttached() was added as an analog to resolveType(). Also, added a test documenting the current attached type resolution behavior. Change-Id: Ib8d6713790f9ce2e2fe36b8620bbbbe36cb23705 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-23 07:21:59 +00:00
void attachedTypeResolution_data();
void attachedTypeResolution();
QQmlSA: Remove Element ctor taking a name, add resolveBuiltinType The Element constructor taking a name would internally create a QQmlJSScope with a matching internal name – without doing any validation that such an internal name would be sensible. Additionally, you could create an Element with it, but you coudln't do anything sensible with it as Element only has a read-only API, and the constructed QQmlJSScope only contains a name. Lastly, we do not really want to expose the internalName as anything more than a transparent id at most. Checking users of the constructor, one quickly finds that the only usage was inside the quick plugin, which needed it to get access to the "function" type; it also relied on "inherits" only checking the internalName. As an alternative, we can provide a resolveBuiltinType which can be used for further checking, and actually returns the correct type with all its methods and attributens, instead of a mock type which happens to work in equality checks. Pick-to: 6.6 Change-Id: I212532053d1b5c898776a564f2011ba17b074079 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-07-03 14:41:51 +00:00
void builtinTypeResolution_data();
void builtinTypeResolution();
QQmlJS: Store method's source location and expose it in QQmlSA This is useful for tooling like Axivion and can help with better error messages. Change-Id: Ic63afd2eeb4ee3627d05303c2518fa90282fb7ab Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-04-02 09:23:56 +00:00
void methodAndSignalSourceLocation();
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
public:
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
tst_qqmljsscope()
: QQmlDataTest(QT_QMLTEST_DATADIR),
m_importer(
{
QLibraryInfo::path(QLibraryInfo::QmlImportsPath),
dataDirectory(),
tst_qqmljsscope: Fix test module importing The name of the module's folder should match the URI and application binary dir should be provided as an extra import path for the module to be discoverable Change-Id: I00d67593d18dc86c0929f8a64b2c165221a4758a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-04 12:13:09 +00:00
// Note: to be able to import the QQmlJSScopeTests
// correctly, we need an additional import path. Use
// this application's binary directory as done by
// QQmlImportDatabase
QCoreApplication::applicationDirPath(),
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
},
nullptr)
{
}
private:
QQmlJSImporter m_importer;
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
};
void tst_qqmljsscope::initTestCase()
{
QQmlDataTest::initTestCase();
QDirIterator it(dataDirectory(), QDirIterator::FollowSymlinks | QDirIterator::Subdirectories);
while (it.hasNext()) {
const QString url = it.next();
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
if (!url.endsWith(u".qml"_s)) // not interesting
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
continue;
const QFileInfo fi(url);
QVERIFY(fi.exists());
QFile f(fi.absoluteFilePath());
QVERIFY(f.open(QIODevice::ReadOnly));
}
tst_qqmljsscope: Fix test module importing The name of the module's folder should match the URI and application binary dir should be provided as an extra import path for the module to be discoverable Change-Id: I00d67593d18dc86c0929f8a64b2c165221a4758a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-04 12:13:09 +00:00
// test that we can import the module shipped with this test: if we have no
// errors / warnings, it is a success
QVERIFY(run(u"importOwnModule.qml"_s));
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
}
void tst_qqmljsscope::orderedBindings()
{
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QQmlJSScope::ConstPtr root = run(u"orderedBindings.qml"_s);
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
QVERIFY(root);
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
auto [pBindingsBegin, pBindingsEnd] = root->ownPropertyBindings(u"p"_s);
qqmljsimportvisitor: Fix assert being hit on empty block bindings We previously hit an assert / crashed if we saw an empty script binding. Fixes: QTBUG-103707 Change-Id: I117d984a7d315ecf860d2ada5568637d154ae083 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-05-19 13:41:24 +00:00
QCOMPARE(std::distance(pBindingsBegin, pBindingsEnd), 2);
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
// check that the bindings are properly ordered
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(pBindingsBegin->bindingType(), QQmlSA::BindingType::Object);
QCOMPARE(std::next(pBindingsBegin)->bindingType(), QQmlSA::BindingType::Interceptor);
QQmlJSImportVisitor: record UiArrayBinding as binding UiArrayBinding stores object bindings for list<Type> properties (where Type is, or is derived from, QtObject) Test the change both in qmllint (with an ordinary "it reports warnings when needed") and by introspecting QQmlJSScope. In the latter case we can also ensure that the bindings are recorded in the correct order Fixes: QTBUG-93358 Change-Id: Ib5544ba339e22ea899191483a5ba53f755314daa Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-24 08:53:10 +00:00
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
auto [itemsBindingsBegin, itemsBindingsEnd] = root->ownPropertyBindings(u"items"_s);
qqmljsimportvisitor: Fix assert being hit on empty block bindings We previously hit an assert / crashed if we saw an empty script binding. Fixes: QTBUG-103707 Change-Id: I117d984a7d315ecf860d2ada5568637d154ae083 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-05-19 13:41:24 +00:00
QCOMPARE(std::distance(itemsBindingsBegin, itemsBindingsEnd), 2);
QQmlJSImportVisitor: record UiArrayBinding as binding UiArrayBinding stores object bindings for list<Type> properties (where Type is, or is derived from, QtObject) Test the change both in qmllint (with an ordinary "it reports warnings when needed") and by introspecting QQmlJSScope. In the latter case we can also ensure that the bindings are recorded in the correct order Fixes: QTBUG-93358 Change-Id: Ib5544ba339e22ea899191483a5ba53f755314daa Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-24 08:53:10 +00:00
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(itemsBindingsBegin->bindingType(), QQmlSA::BindingType::Object);
QCOMPARE(std::next(itemsBindingsBegin)->bindingType(), QQmlSA::BindingType::Object);
QQmlJSImportVisitor: record UiArrayBinding as binding UiArrayBinding stores object bindings for list<Type> properties (where Type is, or is derived from, QtObject) Test the change both in qmllint (with an ordinary "it reports warnings when needed") and by introspecting QQmlJSScope. In the latter case we can also ensure that the bindings are recorded in the correct order Fixes: QTBUG-93358 Change-Id: Ib5544ba339e22ea899191483a5ba53f755314daa Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-24 08:53:10 +00:00
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QCOMPARE(itemsBindingsBegin->objectType()->baseTypeName(), u"Item"_s);
QCOMPARE(std::next(itemsBindingsBegin)->objectType()->baseTypeName(), u"Text"_s);
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
}
Distinguish property change signals from user-defined signals Do not expose this information to qmltypes just yet, though, as this seems irrelevant at the moment Pick-to: 6.3 Change-Id: Iffd8901ef9899a0fff226e8799bf45c1d688b92b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-01-27 14:02:00 +00:00
void tst_qqmljsscope::signalCreationDifferences()
{
qmllint: Warn about duplicated signal/property names Qmllint does not warn about duplicated property and signal names while qmlengine complains about them. Introduce a new logging category for the duplicated names and log duplicated property/signals. This change breaks one of tst_qmljsscope testcase as it expects no logging within that case, edit it. Fixes: QTBUG-106579 Change-Id: I7732e08778a25e1eb2ba980ae395564b98c665a5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-10-13 13:42:05 +00:00
QQmlJSScope::ConstPtr root = run(u"signalCreationDifferences.qml"_s, true);
Distinguish property change signals from user-defined signals Do not expose this information to qmltypes just yet, though, as this seems irrelevant at the moment Pick-to: 6.3 Change-Id: Iffd8901ef9899a0fff226e8799bf45c1d688b92b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-01-27 14:02:00 +00:00
QVERIFY(root);
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QVERIFY(root->hasOwnProperty(u"myProperty"_s));
QVERIFY(root->hasOwnProperty(u"conflictingProperty"_s));
QCOMPARE(root->ownMethods(u"mySignal"_s).size(), 1);
Distinguish property change signals from user-defined signals Do not expose this information to qmltypes just yet, though, as this seems irrelevant at the moment Pick-to: 6.3 Change-Id: Iffd8901ef9899a0fff226e8799bf45c1d688b92b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-01-27 14:02:00 +00:00
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
const auto conflicting = root->ownMethods(u"conflictingPropertyChanged"_s);
Distinguish property change signals from user-defined signals Do not expose this information to qmltypes just yet, though, as this seems irrelevant at the moment Pick-to: 6.3 Change-Id: Iffd8901ef9899a0fff226e8799bf45c1d688b92b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-01-27 14:02:00 +00:00
QCOMPARE(conflicting.size(), 2);
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(conflicting[0].methodType(), QQmlJSMetaMethodType::Signal);
QCOMPARE(conflicting[1].methodType(), QQmlJSMetaMethodType::Signal);
Distinguish property change signals from user-defined signals Do not expose this information to qmltypes just yet, though, as this seems irrelevant at the moment Pick-to: 6.3 Change-Id: Iffd8901ef9899a0fff226e8799bf45c1d688b92b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-01-27 14:02:00 +00:00
const QQmlJSMetaMethod *explicitMethod = nullptr;
if (conflicting[0].isImplicitQmlPropertyChangeSignal())
explicitMethod = &conflicting[1];
else
explicitMethod = &conflicting[0];
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QCOMPARE(explicitMethod->parameterNames(), QStringList({ u"a"_s, u"c"_s }));
Distinguish property change signals from user-defined signals Do not expose this information to qmltypes just yet, though, as this seems irrelevant at the moment Pick-to: 6.3 Change-Id: Iffd8901ef9899a0fff226e8799bf45c1d688b92b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-01-27 14:02:00 +00:00
}
QmlCompiler: Discern between internal and anonymous imports Anonymous imports are imports of QML types that aren't visible in the current document. Internal imports are imports of C++ types, also invisible, but potentially of the same names. Before, types with exports were added to the qmltypes container using their exports if any matched. If there were no exports, we constructed a synthetic name and inserted that. However, as the nullptr example shows, we need a reliable way to find them by their internal names, no matter if exports are present. Therefore, we now consistently add them by their internal names using the new $internal$ prefix. Change-Id: I42ac2447cd924d09970c24554e1e2a5e631c5f79 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-02-03 13:39:58 +00:00
void tst_qqmljsscope::allTypesAvailable()
{
const QStringList importPaths = {
QLibraryInfo::path(QLibraryInfo::QmlImportsPath),
dataDirectory(),
};
QQmlJSImporter importer { importPaths, /* resource file mapper */ nullptr };
QmlCompiler: Enforce consistency of ContextualTypes An instance of ContextualTypes can only either hold QML types or internal types. We always need an integer and an array type, though. Previously, "int" was always added to the used types when it was looked up for potentially resolving enums. This prevented the builtins from being reported as unused import. Since we pass "int" as a separate member now, prevent the builtins from being recorded as import location in the first place. Task-number: QTBUG-107171 Change-Id: I288b6e070c2039d4ac85073886c9929a2eed3998 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-10-19 11:07:56 +00:00
const auto imported = importer.importModule(u"QtQml"_s);
QQmlJSScope: Decouple ContextualTypes ContextualTypes are required in the import visitor logic, but they aren't actually used directly inside QQmlJSScope. Change-Id: I5cd49076687ef97c1077678c8dc757cde3b94c51 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> Reviewed-by: Semih Yavuz <semih.yavuz@qt.io>
2023-08-01 13:43:15 +00:00
QCOMPARE(imported.context(), QQmlJS::ContextualTypes::QML);
QmlCompiler: Enforce consistency of ContextualTypes An instance of ContextualTypes can only either hold QML types or internal types. We always need an integer and an array type, though. Previously, "int" was always added to the used types when it was looked up for potentially resolving enums. This prevented the builtins from being reported as unused import. Since we pass "int" as a separate member now, prevent the builtins from being recorded as import location in the first place. Task-number: QTBUG-107171 Change-Id: I288b6e070c2039d4ac85073886c9929a2eed3998 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-10-19 11:07:56 +00:00
const auto types = imported.types();
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QVERIFY(types.contains(u"$internal$.QObject"_s));
QVERIFY(types.contains(u"QtObject"_s));
QCOMPARE(types[u"$internal$.QObject"_s].scope, types[u"QtObject"_s].scope);
QmlCompiler: Discern between internal and anonymous imports Anonymous imports are imports of QML types that aren't visible in the current document. Internal imports are imports of C++ types, also invisible, but potentially of the same names. Before, types with exports were added to the qmltypes container using their exports if any matched. If there were no exports, we constructed a synthetic name and inserted that. However, as the nullptr example shows, we need a reliable way to find them by their internal names, no matter if exports are present. Therefore, we now consistently add them by their internal names using the new $internal$ prefix. Change-Id: I42ac2447cd924d09970c24554e1e2a5e631c5f79 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-02-03 13:39:58 +00:00
}
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
void tst_qqmljsscope::shadowing()
{
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QQmlJSScope::ConstPtr root = run(u"shadowing.qml"_s);
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
QVERIFY(root);
QVERIFY(root->baseType());
// Check whether properties are properly shadowed
const auto properties = root->properties();
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QVERIFY(properties.contains(u"property_not_shadowed"_s));
QVERIFY(properties.contains(u"property_shadowed"_s));
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QCOMPARE(properties[u"property_not_shadowed"_s].typeName(), u"QString"_s);
QCOMPARE(properties[u"property_shadowed"_s].typeName(), u"int"_s);
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
// Check whether methods are properly shadowed
const auto methods = root->methods();
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QCOMPARE(methods.count(u"method_not_shadowed"_s), 1);
QCOMPARE(methods.count(u"method_shadowed"_s), 1);
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QCOMPARE(methods[u"method_not_shadowed"_s].parameterNames().size(), 1);
QCOMPARE(methods[u"method_shadowed"_s].parameterNames().size(), 0);
qmllint: Make "Did you mean" look in extension types as well Makes sure we also look for suggestions in extension types. Adds two new methods to QQmlJSScope called properties() and methods() to easily get all of them across base types and extensions. Change-Id: I5874c0221bac6d6e317b79146227bf749100f05b Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-11 15:03:18 +00:00
}
QQmlJSImportVisitor mark required aliases as required in their scope When `QQmlJSImportVisitor` visits a program, it marks properties as required in their scope when it encounters them or it encounters a `required` statement. For aliases, an additional step is performed at the end of a visit, when the aliases are resolved. After an alias is resolved to a target property, is "requiredness", is set based on the required of the target property in its scope. Due to the specific implementation, the alias will be set to required in its scope if the target property is required in its scope and will be set to be non-required otherwise, independently of its previous required state. When we have an alias that is itself required pointing to a property that isn't required, for example: ``` Item { id: self property int foo property alias alias: self.foo required alias } ``` The alias will always be marked as not required, as it always inherits the required state of the target property, losing the required status that was applied by the "required" statement. To respect "required" statements in relation to aliases, `QQmlJSImportVisitor::resolveAliasesAndIds` will now inherit the "requiredness" of the target property only when the alias is not already marked as required in its scope. Fixes: QTBUG-123837 Change-Id: I7b0f6958287625f3f3a5d736d4c45a3e050d4502 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2024-03-29 10:52:43 +00:00
void tst_qqmljsscope::requiredAlias()
{
QQmlJSScope::ConstPtr root = run(u"requiredAlias.qml"_s);
QVERIFY(root);
// Check whether aliases marked as required are required
QVERIFY(root->isPropertyRequired("sameScopeAlias"));
QVERIFY(root->isPropertyRequired("innerScopeAlias"));
}
Rework QQmlJSScope::causesImplicitComponentWrapping() It does not seem correct to be able to use this function for both sides of binding expressions: the property type and the assigned QML type (`<property> : <qml type> {}`). Instead, it should really be a function that considers both sides together (and actually checks the sides differently!) What we really should do for the assigned QML type is figure whether its *first* non-composite base is a QQmlComponent - not just that it is a QQmlComponent itself. Leave the QQmlAbstractDelegateComponent check in place since this part is correct The property itself, on the other hand, seems to cause an implicit component wrapping if its type is QQmlComponent-derived (which means we have to check the full C++ hierarchy) As a drive by, also update QQmlJSScope::canAssign() since it used the old function internally and was ignoring the case when a to-be-assigned type lacks a C++ base type hierarchy (e.g. because it does not exist ahead of time) Pick-to: 6.3 Change-Id: I23524fa54d45d9140e1cafd9f81ef1f68d95f3a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-15 15:43:38 +00:00
#ifdef LABS_QML_MODELS_PRESENT
void tst_qqmljsscope::componentWrappedObjects()
{
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QQmlJSScope::ConstPtr root = run(u"componentWrappedObjects.qml"_s);
Rework QQmlJSScope::causesImplicitComponentWrapping() It does not seem correct to be able to use this function for both sides of binding expressions: the property type and the assigned QML type (`<property> : <qml type> {}`). Instead, it should really be a function that considers both sides together (and actually checks the sides differently!) What we really should do for the assigned QML type is figure whether its *first* non-composite base is a QQmlComponent - not just that it is a QQmlComponent itself. Leave the QQmlAbstractDelegateComponent check in place since this part is correct The property itself, on the other hand, seems to cause an implicit component wrapping if its type is QQmlComponent-derived (which means we have to check the full C++ hierarchy) As a drive by, also update QQmlJSScope::canAssign() since it used the old function internally and was ignoring the case when a to-be-assigned type lacks a C++ base type hierarchy (e.g. because it does not exist ahead of time) Pick-to: 6.3 Change-Id: I23524fa54d45d9140e1cafd9f81ef1f68d95f3a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-15 15:43:38 +00:00
QVERIFY(root);
auto children = root->childScopes();
qqmljsscope: track inline component names This patch tracks inline component names to qqmljsscope, which will be useful in a later patch in qmltc to support inline components. Also adds a hashable type representing either the document root or the inline component name that will serve later in qmltcvisitor to separate types by inline components/document root. Implementation details: * Extend qqmljsscope + qqmljsimportvisitor ** keep track of inline component names in visitor and qqmljsscope ** types know (through their parent) if they are inside an inline component and their inline component name * added tests: ** see if QQmlJSScope can detect implicitly wrapped components inside of inline components Change-Id: I9b8b4eefe147f8f826820c3e9dabf3733b0f2d6f Task-Id: QTBUG-105946 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-08-25 16:13:14 +00:00
QCOMPARE(children.size(), 6);
Rework QQmlJSScope::causesImplicitComponentWrapping() It does not seem correct to be able to use this function for both sides of binding expressions: the property type and the assigned QML type (`<property> : <qml type> {}`). Instead, it should really be a function that considers both sides together (and actually checks the sides differently!) What we really should do for the assigned QML type is figure whether its *first* non-composite base is a QQmlComponent - not just that it is a QQmlComponent itself. Leave the QQmlAbstractDelegateComponent check in place since this part is correct The property itself, on the other hand, seems to cause an implicit component wrapping if its type is QQmlComponent-derived (which means we have to check the full C++ hierarchy) As a drive by, also update QQmlJSScope::canAssign() since it used the old function internally and was ignoring the case when a to-be-assigned type lacks a C++ base type hierarchy (e.g. because it does not exist ahead of time) Pick-to: 6.3 Change-Id: I23524fa54d45d9140e1cafd9f81ef1f68d95f3a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-15 15:43:38 +00:00
const auto isGoodType = [](const QQmlJSScope::ConstPtr &type, const QString &propertyName,
bool isWrapped) {
return type->hasOwnProperty(propertyName)
&& type->isWrappedInImplicitComponent() == isWrapped;
};
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QVERIFY(isGoodType(children[0], u"nonWrapped1"_s, false));
QVERIFY(isGoodType(children[1], u"nonWrapped2"_s, false));
QVERIFY(isGoodType(children[2], u"nonWrapped3"_s, false));
QVERIFY(isGoodType(children[3], u"wrapped"_s, true));
qqmljsscope: track inline component names This patch tracks inline component names to qqmljsscope, which will be useful in a later patch in qmltc to support inline components. Also adds a hashable type representing either the document root or the inline component name that will serve later in qmltcvisitor to separate types by inline components/document root. Implementation details: * Extend qqmljsscope + qqmljsimportvisitor ** keep track of inline component names in visitor and qqmljsscope ** types know (through their parent) if they are inside an inline component and their inline component name * added tests: ** see if QQmlJSScope can detect implicitly wrapped components inside of inline components Change-Id: I9b8b4eefe147f8f826820c3e9dabf3733b0f2d6f Task-Id: QTBUG-105946 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-08-25 16:13:14 +00:00
QCOMPARE(children[4]->childScopes().size(), 3);
QVERIFY(isGoodType(children[4]->childScopes()[0], u"wrapped"_s, true));
QCOMPARE(children[4]->childScopes()[1]->childScopes().size(), 1);
QVERIFY(isGoodType(children[4]->childScopes()[1]->childScopes()[0], u"wrapped2"_s, true));
QCOMPARE(children[4]->childScopes()[2]->childScopes().size(), 1);
QVERIFY(isGoodType(children[4]->childScopes()[2]->childScopes()[0], u"wrapped3"_s, false));
Rework QQmlJSScope::causesImplicitComponentWrapping() It does not seem correct to be able to use this function for both sides of binding expressions: the property type and the assigned QML type (`<property> : <qml type> {}`). Instead, it should really be a function that considers both sides together (and actually checks the sides differently!) What we really should do for the assigned QML type is figure whether its *first* non-composite base is a QQmlComponent - not just that it is a QQmlComponent itself. Leave the QQmlAbstractDelegateComponent check in place since this part is correct The property itself, on the other hand, seems to cause an implicit component wrapping if its type is QQmlComponent-derived (which means we have to check the full C++ hierarchy) As a drive by, also update QQmlJSScope::canAssign() since it used the old function internally and was ignoring the case when a to-be-assigned type lacks a C++ base type hierarchy (e.g. because it does not exist ahead of time) Pick-to: 6.3 Change-Id: I23524fa54d45d9140e1cafd9f81ef1f68d95f3a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-15 15:43:38 +00:00
}
Add QmlModels dependency to LabsQmlModels Some classes (e.g. QQmlDelegateChooser) depend-on / inherit QmlModels' functionality. We need to propagate that dependency to QML via qmldir entry, otherwise we won't be able to see the types in QmlCompiler lib Note that we already depend more strongly (via linking) on the QmlModels library, so there is no reason not to depend on the QML module in qmldir Pick-to: 6.2 6.3 Change-Id: I4f16f66f2910fb6afd38475cd6ba3209cfd1207d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-28 11:45:35 +00:00
void tst_qqmljsscope::labsQmlModelsSanity()
{
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QQmlJSScope::ConstPtr root = run(u"labsQmlModelsSanity.qml"_s);
Add QmlModels dependency to LabsQmlModels Some classes (e.g. QQmlDelegateChooser) depend-on / inherit QmlModels' functionality. We need to propagate that dependency to QML via qmldir entry, otherwise we won't be able to see the types in QmlCompiler lib Note that we already depend more strongly (via linking) on the QmlModels library, so there is no reason not to depend on the QML module in qmldir Pick-to: 6.2 6.3 Change-Id: I4f16f66f2910fb6afd38475cd6ba3209cfd1207d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-28 11:45:35 +00:00
QVERIFY(root);
auto children = root->childScopes();
QCOMPARE(children.size(), 1);
// DelegateChooser: it inherits QQmlAbstractDelegateComponent (from
// QmlModels) which inherits QQmlComponent. While
// QQmlAbstractDelegateComponent has no properties, QQmlComponent does. If
// the QmlModels dependency is lost, we don't "see" that DelegateChooser
// inherits QQmlComponent - and so has no properties from it, hence, we can
// test exactly that:
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QVERIFY(children[0]->hasProperty(u"progress"_s));
QVERIFY(children[0]->hasProperty(u"status"_s));
QVERIFY(children[0]->hasProperty(u"url"_s));
Add QmlModels dependency to LabsQmlModels Some classes (e.g. QQmlDelegateChooser) depend-on / inherit QmlModels' functionality. We need to propagate that dependency to QML via qmldir entry, otherwise we won't be able to see the types in QmlCompiler lib Note that we already depend more strongly (via linking) on the QmlModels library, so there is no reason not to depend on the QML module in qmldir Pick-to: 6.2 6.3 Change-Id: I4f16f66f2910fb6afd38475cd6ba3209cfd1207d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-28 11:45:35 +00:00
}
Rework QQmlJSScope::causesImplicitComponentWrapping() It does not seem correct to be able to use this function for both sides of binding expressions: the property type and the assigned QML type (`<property> : <qml type> {}`). Instead, it should really be a function that considers both sides together (and actually checks the sides differently!) What we really should do for the assigned QML type is figure whether its *first* non-composite base is a QQmlComponent - not just that it is a QQmlComponent itself. Leave the QQmlAbstractDelegateComponent check in place since this part is correct The property itself, on the other hand, seems to cause an implicit component wrapping if its type is QQmlComponent-derived (which means we have to check the full C++ hierarchy) As a drive by, also update QQmlJSScope::canAssign() since it used the old function internally and was ignoring the case when a to-be-assigned type lacks a C++ base type hierarchy (e.g. because it does not exist ahead of time) Pick-to: 6.3 Change-Id: I23524fa54d45d9140e1cafd9f81ef1f68d95f3a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-15 15:43:38 +00:00
#endif
void tst_qqmljsscope::unknownCppBase()
{
QQmlJSImportVisitor: do not register group { ... } as an object scope Grouped properties do not bind to a default property and they are not object definition scopes. Fix the subtle issue where we'd do the opposite for `group { ... }` syntax Submit the tst_qqmljsscope changes that made the issue visible Pick-to: 6.3 Change-Id: I314b19d5cad62f70146d228e5402c9fc73b309ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-04 10:35:58 +00:00
QQmlJSScope::ConstPtr root = run(u"unknownCppBaseAssigningToVar.qml"_s, true);
Rework QQmlJSScope::causesImplicitComponentWrapping() It does not seem correct to be able to use this function for both sides of binding expressions: the property type and the assigned QML type (`<property> : <qml type> {}`). Instead, it should really be a function that considers both sides together (and actually checks the sides differently!) What we really should do for the assigned QML type is figure whether its *first* non-composite base is a QQmlComponent - not just that it is a QQmlComponent itself. Leave the QQmlAbstractDelegateComponent check in place since this part is correct The property itself, on the other hand, seems to cause an implicit component wrapping if its type is QQmlComponent-derived (which means we have to check the full C++ hierarchy) As a drive by, also update QQmlJSScope::canAssign() since it used the old function internally and was ignoring the case when a to-be-assigned type lacks a C++ base type hierarchy (e.g. because it does not exist ahead of time) Pick-to: 6.3 Change-Id: I23524fa54d45d9140e1cafd9f81ef1f68d95f3a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-15 15:43:38 +00:00
QVERIFY(root);
// we should not crash here, then it is a success
}
qmlcompiler: Improve grouped property support Still lacks support for merging and resolving grouped bindings, but this will be handled in another patch. Task-number: QTBUG-100168 Original-patch-by: Fabian Kosmale <fabian.kosmale@qt.io> Change-Id: I1bb73f383acc3c8512676db47c5944f369b904b7 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-18 13:16:09 +00:00
void tst_qqmljsscope::groupedProperties()
{
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QQmlJSScope::ConstPtr root = run(u"groupProperties.qml"_s);
qmlcompiler: Improve grouped property support Still lacks support for merging and resolving grouped bindings, but this will be handled in another patch. Task-number: QTBUG-100168 Original-patch-by: Fabian Kosmale <fabian.kosmale@qt.io> Change-Id: I1bb73f383acc3c8512676db47c5944f369b904b7 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-18 13:16:09 +00:00
QVERIFY(root);
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QVERIFY(root->hasProperty(u"anchors"_s));
const auto anchorBindings = root->propertyBindings(u"anchors"_s);
qmlcompiler: Improve grouped property support Still lacks support for merging and resolving grouped bindings, but this will be handled in another patch. Task-number: QTBUG-100168 Original-patch-by: Fabian Kosmale <fabian.kosmale@qt.io> Change-Id: I1bb73f383acc3c8512676db47c5944f369b904b7 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-18 13:16:09 +00:00
QVERIFY(!anchorBindings.isEmpty());
QQmlJSMetaPropertyBinding:add group type fetching function, extend tests Change-Id: I754349ab5b6a8125ccc373210fc073dd71583c6f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-29 15:19:36 +00:00
QCOMPARE(anchorBindings.size(), 2); // from type itself and from the base type
const auto getBindingsWithinGroup =
[&](QMultiHash<QString, QQmlJSMetaPropertyBinding> *bindings, qsizetype index) -> void {
const auto &binding = anchorBindings[index];
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(binding.bindingType(), QQmlSA::BindingType::GroupProperty);
QQmlJSMetaPropertyBinding:add group type fetching function, extend tests Change-Id: I754349ab5b6a8125ccc373210fc073dd71583c6f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-29 15:19:36 +00:00
auto anchorScope = binding.groupType();
QVERIFY(anchorScope);
*bindings = anchorScope->ownPropertyBindings();
};
const auto value = [](const QMultiHash<QString, QQmlJSMetaPropertyBinding> &bindings,
const QString &key) {
return bindings.value(key, QQmlJSMetaPropertyBinding(QQmlJS::SourceLocation {}));
};
QMultiHash<QString, QQmlJSMetaPropertyBinding> bindingsOfType;
getBindingsWithinGroup(&bindingsOfType, 0);
QCOMPARE(bindingsOfType.size(), 2);
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(value(bindingsOfType, u"left"_s).bindingType(), QQmlSA::BindingType::Script);
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QCOMPARE(value(bindingsOfType, u"leftMargin"_s).bindingType(),
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QQmlSA::BindingType::NumberLiteral);
QQmlJSMetaPropertyBinding:add group type fetching function, extend tests Change-Id: I754349ab5b6a8125ccc373210fc073dd71583c6f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-29 15:19:36 +00:00
QMultiHash<QString, QQmlJSMetaPropertyBinding> bindingsOfBaseType;
getBindingsWithinGroup(&bindingsOfBaseType, 1);
QCOMPARE(bindingsOfBaseType.size(), 1);
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(value(bindingsOfBaseType, u"top"_s).bindingType(), QQmlSA::BindingType::Script);
qmlcompiler: Improve grouped property support Still lacks support for merging and resolving grouped bindings, but this will be handled in another patch. Task-number: QTBUG-100168 Original-patch-by: Fabian Kosmale <fabian.kosmale@qt.io> Change-Id: I1bb73f383acc3c8512676db47c5944f369b904b7 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-03-18 13:16:09 +00:00
}
QmlCompiler: Allow retrieval of descriptive name from invalid types Apparently we do that somewhere. It should not just crash. Pick-to: 6.2 6.3 Task-number: QTBUG-102147 Change-Id: Id612e0543d8794aa4f334a899b117142b7a8cd38 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-04-06 09:52:25 +00:00
void tst_qqmljsscope::descriptiveNameOfNull()
{
QQmlJSRegisterContent nullContent;
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QCOMPARE(nullContent.descriptiveName(), u"(invalid type)"_s);
QmlCompiler: Allow retrieval of descriptive name from invalid types Apparently we do that somewhere. It should not just crash. Pick-to: 6.2 6.3 Task-number: QTBUG-102147 Change-Id: Id612e0543d8794aa4f334a899b117142b7a8cd38 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-04-06 09:52:25 +00:00
QQmlJSScope::Ptr stored = QQmlJSScope::create();
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
stored->setInternalName(u"bar"_s);
QmlCompiler: Allow retrieval of descriptive name from invalid types Apparently we do that somewhere. It should not just crash. Pick-to: 6.2 6.3 Task-number: QTBUG-102147 Change-Id: Id612e0543d8794aa4f334a899b117142b7a8cd38 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-04-06 09:52:25 +00:00
QQmlJSMetaProperty property;
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
property.setPropertyName(u"foo"_s);
property.setTypeName(u"baz"_s);
QmlCompiler: Allow retrieval of descriptive name from invalid types Apparently we do that somewhere. It should not just crash. Pick-to: 6.2 6.3 Task-number: QTBUG-102147 Change-Id: Id612e0543d8794aa4f334a899b117142b7a8cd38 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-04-06 09:52:25 +00:00
QQmlJSRegisterContent unscoped = QQmlJSRegisterContent::create(
QmlCompiler: Store lookupIndex in register content for properties This way we can generate a separate register variable for the result of each lookup, which guarantees that we can write back to it if necessary. Task-number: QTBUG-116011 Change-Id: I1d2b8948d8edb66f0665399768df194065dc99be Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-08-14 10:37:42 +00:00
stored, property, QQmlJSRegisterContent::InvalidLookupIndex,
QQmlJSRegisterContent::InvalidLookupIndex, QQmlJSRegisterContent::ScopeProperty,
QQmlJSScope::ConstPtr());
qmlcachegen: Improve warnings for missing return type annotations Fixes: QTBUG-124220 Pick-to: 6.7 Change-Id: Ic31b90b0408d855a45e17647ab659fbbc6e17633 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2024-04-18 11:28:39 +00:00
QCOMPARE(unscoped.descriptiveName(), u"(invalid type)::foo with type baz (stored as bar)"_s);
QmlCompiler: Allow retrieval of descriptive name from invalid types Apparently we do that somewhere. It should not just crash. Pick-to: 6.2 6.3 Task-number: QTBUG-102147 Change-Id: Id612e0543d8794aa4f334a899b117142b7a8cd38 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-04-06 09:52:25 +00:00
}
tst_qqmljsscope: Cover a more sophisticated group property case Document (via test) what happens when we re-assign a group property in the derived scope Introduce a QML test module along the way used within the test As a drive by, add all QML test files to TESTDATA Change-Id: Id4c3e20e45b8e0f3757840c87e0285f8516319a8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-03-30 10:50:46 +00:00
void tst_qqmljsscope::groupedPropertiesConsistency()
{
{
QQmlEngine engine;
QQmlComponent component(&engine);
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
component.loadUrl(testFileUrl(u"groupPropertiesConsistency.qml"_s));
tst_qqmljsscope: Cover a more sophisticated group property case Document (via test) what happens when we re-assign a group property in the derived scope Introduce a QML test module along the way used within the test As a drive by, add all QML test files to TESTDATA Change-Id: Id4c3e20e45b8e0f3757840c87e0285f8516319a8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-03-30 10:50:46 +00:00
QVERIFY2(component.isReady(), qPrintable(component.errorString()));
QScopedPointer<QObject> root(component.create());
QVERIFY2(root, qPrintable(component.errorString()));
QFont font = qvariant_cast<QFont>(root->property("font"));
QCOMPARE(font.pixelSize(), 22);
}
{
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QQmlJSScope::ConstPtr root = run(u"groupPropertiesConsistency.qml"_s);
tst_qqmljsscope: Cover a more sophisticated group property case Document (via test) what happens when we re-assign a group property in the derived scope Introduce a QML test module along the way used within the test As a drive by, add all QML test files to TESTDATA Change-Id: Id4c3e20e45b8e0f3757840c87e0285f8516319a8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-03-30 10:50:46 +00:00
QVERIFY(root);
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
const auto fontBindings = root->propertyBindings(u"font"_s);
tst_qqmljsscope: Cover a more sophisticated group property case Document (via test) what happens when we re-assign a group property in the derived scope Introduce a QML test module along the way used within the test As a drive by, add all QML test files to TESTDATA Change-Id: Id4c3e20e45b8e0f3757840c87e0285f8516319a8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-03-30 10:50:46 +00:00
QCOMPARE(fontBindings.size(), 2);
// The binding order in QQmlJSScope case is "reversed": first come
// bindings on the leaf type, followed by the bindings on the base type
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(fontBindings[0].bindingType(), QQmlSA::BindingType::GroupProperty);
QCOMPARE(fontBindings[1].bindingType(), QQmlSA::BindingType::Script);
tst_qqmljsscope: Cover a more sophisticated group property case Document (via test) what happens when we re-assign a group property in the derived scope Introduce a QML test module along the way used within the test As a drive by, add all QML test files to TESTDATA Change-Id: Id4c3e20e45b8e0f3757840c87e0285f8516319a8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-03-30 10:50:46 +00:00
}
}
qmlcompiler: Create group binding in group property syntax case Cover the following case of binding on a group property: Type { group { foo: 42 } } Task-number: QTBUG-100168 Change-Id: I0147c74dffb649907457d5f17a2ab29473101a6d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 12:15:32 +00:00
void tst_qqmljsscope::groupedPropertySyntax()
{
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QQmlJSScope::ConstPtr root = run(u"groupPropertySyntax.qml"_s);
qmlcompiler: Create group binding in group property syntax case Cover the following case of binding on a group property: Type { group { foo: 42 } } Task-number: QTBUG-100168 Change-Id: I0147c74dffb649907457d5f17a2ab29473101a6d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 12:15:32 +00:00
QVERIFY(root);
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
const auto fontBindings = root->propertyBindings(u"font"_s);
qmlcompiler: Create group binding in group property syntax case Cover the following case of binding on a group property: Type { group { foo: 42 } } Task-number: QTBUG-100168 Change-Id: I0147c74dffb649907457d5f17a2ab29473101a6d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 12:15:32 +00:00
QCOMPARE(fontBindings.size(), 1);
// The binding order in QQmlJSScope case is "reversed": first come
// bindings on the leaf type, followed by the bindings on the base type
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(fontBindings[0].bindingType(), QQmlSA::BindingType::GroupProperty);
qmlcompiler: Create group binding in group property syntax case Cover the following case of binding on a group property: Type { group { foo: 42 } } Task-number: QTBUG-100168 Change-Id: I0147c74dffb649907457d5f17a2ab29473101a6d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 12:15:32 +00:00
auto fontScope = fontBindings[0].groupType();
QVERIFY(fontScope);
Inherit base type access semantics in QQmlJSScopes Group scopes may be value types so they require access semantics different from a default value Ordinary scopes and attached scopes seem unaffected, only groups are thus covered with an extra logic Change-Id: Ia9012548a602ca7ca07296491d27a295f4455f91 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 14:24:24 +00:00
QCOMPARE(fontScope->accessSemantics(), QQmlJSScope::AccessSemantics::Value);
qmlcompiler: Create group binding in group property syntax case Cover the following case of binding on a group property: Type { group { foo: 42 } } Task-number: QTBUG-100168 Change-Id: I0147c74dffb649907457d5f17a2ab29473101a6d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 12:15:32 +00:00
auto subbindings = fontScope->ownPropertyBindings();
QCOMPARE(subbindings.size(), 2);
const auto value = [](const QMultiHash<QString, QQmlJSMetaPropertyBinding> &bindings,
const QString &key) {
return bindings.value(key, QQmlJSMetaPropertyBinding(QQmlJS::SourceLocation {}));
};
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(value(subbindings, u"pixelSize"_s).bindingType(), QQmlSA::BindingType::NumberLiteral);
QCOMPARE(value(subbindings, u"bold"_s).bindingType(), QQmlSA::BindingType::BoolLiteral);
qmlcompiler: Create group binding in group property syntax case Cover the following case of binding on a group property: Type { group { foo: 42 } } Task-number: QTBUG-100168 Change-Id: I0147c74dffb649907457d5f17a2ab29473101a6d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 12:15:32 +00:00
}
qmlcompiler: Support attached property bindings Extend group property binding creation with attached properties case As a drive by, add extra attached property tests for QML and qmltc, covering the case where an attaching type exists in both base and derived types Task-number: QTBUG-102082 Change-Id: I6c0d2b941da72d6dab7fc05a4f7b2a7875423ef0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 15:16:11 +00:00
void tst_qqmljsscope::attachedProperties()
{
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QQmlJSScope::ConstPtr root = run(u"attachedProperties.qml"_s);
qmlcompiler: Support attached property bindings Extend group property binding creation with attached properties case As a drive by, add extra attached property tests for QML and qmltc, covering the case where an attaching type exists in both base and derived types Task-number: QTBUG-102082 Change-Id: I6c0d2b941da72d6dab7fc05a4f7b2a7875423ef0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 15:16:11 +00:00
QVERIFY(root);
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
const auto keysBindings = root->propertyBindings(u"Keys"_s);
qmlcompiler: Support attached property bindings Extend group property binding creation with attached properties case As a drive by, add extra attached property tests for QML and qmltc, covering the case where an attaching type exists in both base and derived types Task-number: QTBUG-102082 Change-Id: I6c0d2b941da72d6dab7fc05a4f7b2a7875423ef0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 15:16:11 +00:00
QVERIFY(!keysBindings.isEmpty());
QCOMPARE(keysBindings.size(), 2); // from type itself and from the base type
const auto getBindingsWithinAttached =
[&](QMultiHash<QString, QQmlJSMetaPropertyBinding> *bindings, qsizetype index) -> void {
const auto &binding = keysBindings[index];
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(binding.bindingType(), QQmlSA::BindingType::AttachedProperty);
qmlcompiler: Support attached property bindings Extend group property binding creation with attached properties case As a drive by, add extra attached property tests for QML and qmltc, covering the case where an attaching type exists in both base and derived types Task-number: QTBUG-102082 Change-Id: I6c0d2b941da72d6dab7fc05a4f7b2a7875423ef0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 15:16:11 +00:00
auto keysScope = binding.attachingType();
QVERIFY(keysScope);
Inherit base type access semantics in QQmlJSScopes Group scopes may be value types so they require access semantics different from a default value Ordinary scopes and attached scopes seem unaffected, only groups are thus covered with an extra logic Change-Id: Ia9012548a602ca7ca07296491d27a295f4455f91 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 14:24:24 +00:00
QCOMPARE(keysScope->accessSemantics(), QQmlJSScope::AccessSemantics::Reference);
qmlcompiler: Support attached property bindings Extend group property binding creation with attached properties case As a drive by, add extra attached property tests for QML and qmltc, covering the case where an attaching type exists in both base and derived types Task-number: QTBUG-102082 Change-Id: I6c0d2b941da72d6dab7fc05a4f7b2a7875423ef0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 15:16:11 +00:00
*bindings = keysScope->ownPropertyBindings();
};
const auto value = [](const QMultiHash<QString, QQmlJSMetaPropertyBinding> &bindings,
const QString &key) {
return bindings.value(key, QQmlJSMetaPropertyBinding(QQmlJS::SourceLocation {}));
};
QMultiHash<QString, QQmlJSMetaPropertyBinding> bindingsOfType;
getBindingsWithinAttached(&bindingsOfType, 0);
QCOMPARE(bindingsOfType.size(), 2);
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(value(bindingsOfType, u"enabled"_s).bindingType(), QQmlSA::BindingType::BoolLiteral);
QCOMPARE(value(bindingsOfType, u"forwardTo"_s).bindingType(), QQmlSA::BindingType::Script);
qmlcompiler: Support attached property bindings Extend group property binding creation with attached properties case As a drive by, add extra attached property tests for QML and qmltc, covering the case where an attaching type exists in both base and derived types Task-number: QTBUG-102082 Change-Id: I6c0d2b941da72d6dab7fc05a4f7b2a7875423ef0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 15:16:11 +00:00
QMultiHash<QString, QQmlJSMetaPropertyBinding> bindingsOfBaseType;
getBindingsWithinAttached(&bindingsOfBaseType, 1);
QCOMPARE(bindingsOfBaseType.size(), 1);
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(value(bindingsOfBaseType, u"priority"_s).bindingType(), QQmlSA::BindingType::Script);
qmlcompiler: Support attached property bindings Extend group property binding creation with attached properties case As a drive by, add extra attached property tests for QML and qmltc, covering the case where an attaching type exists in both base and derived types Task-number: QTBUG-102082 Change-Id: I6c0d2b941da72d6dab7fc05a4f7b2a7875423ef0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-03-30 15:16:11 +00:00
}
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
inline QString getScopeName(const QQmlJSScope::ConstPtr &scope)
{
Q_ASSERT(scope);
QQmlJSScope::ScopeType type = scope->scopeType();
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
if (type == QQmlSA::ScopeType::GroupedPropertyScope
|| type == QQmlSA::ScopeType::AttachedPropertyScope)
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
return scope->internalName();
return scope->baseTypeName();
}
QmlCompiler: Fix script indices calculation The logic is misbehaving on multiple occasions. For instance, same-named signal handlers in different scopes and script bindings inside array scopes were wrongly handled. Fix that by revising the mechanism of inner function computation As a drive by, fix parseLiteralOrScriptBinding() to distinguish translation bindings from script bindings (they are vitally different now) Extend the script calculation test in tst_qqmljsscope to cover the findings Pick-to: 6.4 Change-Id: Ic4cf0a4539f0d714a416b61f4635eb6494e89922 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-06-01 14:47:37 +00:00
struct FunctionOrExpressionIdentifier
{
QString name;
QQmlJS::SourceLocation loc = QQmlJS::SourceLocation {}; // source location of owning scope
int index = -1; // relative or absolute script index
FunctionOrExpressionIdentifier() = default;
FunctionOrExpressionIdentifier(const QString &name, const QQmlJS::SourceLocation &l, int i)
: name(name), loc(l), index(i)
{
}
FunctionOrExpressionIdentifier(const QString &name, const QV4::CompiledData::Location &l, int i)
: name(name), loc(QQmlJS::SourceLocation { 0, 0, l.line(), l.column() }), index(i)
{
}
friend bool operator<(const FunctionOrExpressionIdentifier &x,
const FunctionOrExpressionIdentifier &y)
{
// source location is taken from the owner scope so would be non-unique,
// while name must be unique within that scope. so: if source locations
// match, compare by name
if (x.loc == y.loc)
return x.name < y.name;
// otherwise, compare by start line first, if they match, then by column
if (x.loc.startLine == y.loc.startLine)
return x.loc.startColumn < y.loc.startColumn;
return x.loc.startLine < y.loc.startLine;
}
friend bool operator==(const FunctionOrExpressionIdentifier &x,
const FunctionOrExpressionIdentifier &y)
{
// equal-compare by name and index
return x.index == y.index && x.name == y.name;
}
friend bool operator!=(const FunctionOrExpressionIdentifier &x,
const FunctionOrExpressionIdentifier &y)
{
return !(x == y);
}
friend QDebug &operator<<(QDebug &stream, const FunctionOrExpressionIdentifier &x)
{
const QString dump = u"(%1, %2, loc %3:%4)"_s.arg(x.name, QString::number(x.index),
QString::number(x.loc.startLine),
QString::number(x.loc.startColumn));
stream << dump;
return stream.maybeSpace();
}
};
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
void tst_qqmljsscope::scriptIndices()
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
{
{
QQmlEngine engine;
QQmlComponent component(&engine);
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
component.loadUrl(testFileUrl(u"functionAndBindingIndices.qml"_s));
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
QVERIFY2(component.isReady(), qPrintable(component.errorString()));
QScopedPointer<QObject> root(component.create());
QVERIFY2(root, qPrintable(component.errorString()));
}
QmlIR::Document document(false); // we need QmlIR information here
Replace uses of deprecated _qs with _s/QStringLiteral Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-21 09:21:18 +00:00
QQmlJSScope::ConstPtr root = run(u"functionAndBindingIndices.qml"_s, &document);
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
QVERIFY(root);
QtQml: Make base CU a member of ExecutableCompilationUnit We want to re-use the base compilation unit across engines. For that to work it cannot be a slice of the engine-specific ExecutableCompilationUnit. Since CompiledData::CompilationUnit is refcounted on its own now, make it unmovable. Change-Id: I8418c9754d7a07e5210c1e7a7fc69355e1d57807 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-12-21 12:25:11 +00:00
QVERIFY(document.javaScriptCompilationUnit->unitData());
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
// compare QQmlJSScope and QmlIR:
// {property, function}Name and relative (per-object) function table index
QmlCompiler: Fix script indices calculation The logic is misbehaving on multiple occasions. For instance, same-named signal handlers in different scopes and script bindings inside array scopes were wrongly handled. Fix that by revising the mechanism of inner function computation As a drive by, fix parseLiteralOrScriptBinding() to distinguish translation bindings from script bindings (they are vitally different now) Extend the script calculation test in tst_qqmljsscope to cover the findings Pick-to: 6.4 Change-Id: Ic4cf0a4539f0d714a416b61f4635eb6494e89922 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-06-01 14:47:37 +00:00
QList<FunctionOrExpressionIdentifier> orderedJSScopeExpressionsRelative;
QList<FunctionOrExpressionIdentifier> orderedQmlIrExpressionsRelative;
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
// {property, function}Name and absolute (per-document) function table index
QmlCompiler: Fix script indices calculation The logic is misbehaving on multiple occasions. For instance, same-named signal handlers in different scopes and script bindings inside array scopes were wrongly handled. Fix that by revising the mechanism of inner function computation As a drive by, fix parseLiteralOrScriptBinding() to distinguish translation bindings from script bindings (they are vitally different now) Extend the script calculation test in tst_qqmljsscope to cover the findings Pick-to: 6.4 Change-Id: Ic4cf0a4539f0d714a416b61f4635eb6494e89922 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-06-01 14:47:37 +00:00
QList<FunctionOrExpressionIdentifier> orderedJSScopeExpressionsAbsolute;
QList<FunctionOrExpressionIdentifier> orderedQmlIrExpressionsAbsolute;
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
const auto populateQQmlJSScopeArrays =
[&](const QQmlJSScope::ConstPtr &scope, const QString &name,
QQmlJSMetaMethod::RelativeFunctionIndex relativeIndex) {
QmlCompiler: Fix script indices calculation The logic is misbehaving on multiple occasions. For instance, same-named signal handlers in different scopes and script bindings inside array scopes were wrongly handled. Fix that by revising the mechanism of inner function computation As a drive by, fix parseLiteralOrScriptBinding() to distinguish translation bindings from script bindings (they are vitally different now) Extend the script calculation test in tst_qqmljsscope to cover the findings Pick-to: 6.4 Change-Id: Ic4cf0a4539f0d714a416b61f4635eb6494e89922 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-06-01 14:47:37 +00:00
orderedJSScopeExpressionsRelative.emplaceBack(name, scope->sourceLocation(),
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
static_cast<int>(relativeIndex));
auto absoluteIndex = scope->ownRuntimeFunctionIndex(relativeIndex);
QmlCompiler: Fix script indices calculation The logic is misbehaving on multiple occasions. For instance, same-named signal handlers in different scopes and script bindings inside array scopes were wrongly handled. Fix that by revising the mechanism of inner function computation As a drive by, fix parseLiteralOrScriptBinding() to distinguish translation bindings from script bindings (they are vitally different now) Extend the script calculation test in tst_qqmljsscope to cover the findings Pick-to: 6.4 Change-Id: Ic4cf0a4539f0d714a416b61f4635eb6494e89922 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-06-01 14:47:37 +00:00
orderedJSScopeExpressionsAbsolute.emplaceBack(name, scope->sourceLocation(),
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
static_cast<int>(absoluteIndex));
};
const auto populateQmlIRArrays = [&](const QmlIR::Object *irObject, const QString &name,
int relative) {
QmlCompiler: Fix script indices calculation The logic is misbehaving on multiple occasions. For instance, same-named signal handlers in different scopes and script bindings inside array scopes were wrongly handled. Fix that by revising the mechanism of inner function computation As a drive by, fix parseLiteralOrScriptBinding() to distinguish translation bindings from script bindings (they are vitally different now) Extend the script calculation test in tst_qqmljsscope to cover the findings Pick-to: 6.4 Change-Id: Ic4cf0a4539f0d714a416b61f4635eb6494e89922 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-06-01 14:47:37 +00:00
orderedQmlIrExpressionsRelative.emplaceBack(name, irObject->location, relative);
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
auto absolute = irObject->runtimeFunctionIndices.at(relative);
QmlCompiler: Fix script indices calculation The logic is misbehaving on multiple occasions. For instance, same-named signal handlers in different scopes and script bindings inside array scopes were wrongly handled. Fix that by revising the mechanism of inner function computation As a drive by, fix parseLiteralOrScriptBinding() to distinguish translation bindings from script bindings (they are vitally different now) Extend the script calculation test in tst_qqmljsscope to cover the findings Pick-to: 6.4 Change-Id: Ic4cf0a4539f0d714a416b61f4635eb6494e89922 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-06-01 14:47:37 +00:00
orderedQmlIrExpressionsAbsolute.emplaceBack(name, irObject->location, absolute);
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
};
const auto suitableScope = [](const QQmlJSScope::ConstPtr &scope) {
const auto type = scope->scopeType();
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
return type == QQmlSA::ScopeType::QMLScope
|| type == QQmlSA::ScopeType::GroupedPropertyScope
|| type == QQmlSA::ScopeType::AttachedPropertyScope;
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
};
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
QList<QQmlJSScope::ConstPtr> queue;
queue.push_back(root);
while (!queue.isEmpty()) {
auto current = queue.front();
queue.pop_front();
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
if (suitableScope(current)) {
const auto methods = current->ownMethods();
for (const auto &method : methods) {
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
if (method.methodType() == QQmlJSMetaMethodType::Signal)
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
continue;
QString name = method.methodName();
auto relativeIndex = method.jsFunctionIndex();
QVERIFY2(static_cast<int>(relativeIndex) >= 0,
qPrintable(QStringLiteral("Method %1 from %2 has no index")
.arg(name, getScopeName(current))));
populateQQmlJSScopeArrays(current, name, relativeIndex);
}
const auto bindings = current->ownPropertyBindings();
for (const auto &binding : bindings) {
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
if (binding.bindingType() != QQmlSA::BindingType::Script)
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
continue;
QString name = binding.propertyName();
auto relativeIndex = binding.scriptIndex();
QVERIFY2(static_cast<int>(relativeIndex) >= 0,
qPrintable(QStringLiteral("Binding on property %1 from %2 has no index")
.arg(name, getScopeName(current))));
populateQQmlJSScopeArrays(current, name, relativeIndex);
}
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
}
const auto children = current->childScopes();
for (const auto &c : children)
queue.push_back(c);
}
Port from qAsConst() to std::as_const() We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I601bf70f020f511019ed28731ba53b14b765dbf0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2022-10-06 09:30:50 +00:00
for (const QmlIR::Object *irObject : std::as_const(document.objects)) {
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
const QString objectName = document.stringAt(irObject->inheritedTypeNameIndex);
for (auto it = irObject->functionsBegin(); it != irObject->functionsEnd(); ++it) {
QString name = document.stringAt(it->nameIndex);
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
populateQmlIRArrays(irObject, name, it->index);
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
}
for (auto it = irObject->bindingsBegin(); it != irObject->bindingsEnd(); ++it) {
QML: Port QV4::CompiledData::Binding to new special integer bitfield Pick-to: 5.15 6.2 6.3 Task-number: QTBUG-99545 Change-Id: I9f8bc5fa45c61f77ee95b055a3d8de001da8f8c5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-05-04 13:26:30 +00:00
if (it->type() != QmlIR::Binding::Type_Script)
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
continue;
QString name = document.stringAt(it->propertyNameIndex);
int index = it->value.compiledScriptIndex;
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
populateQmlIRArrays(irObject, name, index);
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
}
}
QmlCompiler: Fix script indices calculation The logic is misbehaving on multiple occasions. For instance, same-named signal handlers in different scopes and script bindings inside array scopes were wrongly handled. Fix that by revising the mechanism of inner function computation As a drive by, fix parseLiteralOrScriptBinding() to distinguish translation bindings from script bindings (they are vitally different now) Extend the script calculation test in tst_qqmljsscope to cover the findings Pick-to: 6.4 Change-Id: Ic4cf0a4539f0d714a416b61f4635eb6494e89922 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-06-01 14:47:37 +00:00
std::sort(orderedJSScopeExpressionsRelative.begin(), orderedJSScopeExpressionsRelative.end());
std::sort(orderedQmlIrExpressionsRelative.begin(), orderedQmlIrExpressionsRelative.end());
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
QmlCompiler: Fix script indices calculation The logic is misbehaving on multiple occasions. For instance, same-named signal handlers in different scopes and script bindings inside array scopes were wrongly handled. Fix that by revising the mechanism of inner function computation As a drive by, fix parseLiteralOrScriptBinding() to distinguish translation bindings from script bindings (they are vitally different now) Extend the script calculation test in tst_qqmljsscope to cover the findings Pick-to: 6.4 Change-Id: Ic4cf0a4539f0d714a416b61f4635eb6494e89922 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2022-06-01 14:47:37 +00:00
std::sort(orderedJSScopeExpressionsAbsolute.begin(), orderedJSScopeExpressionsAbsolute.end());
std::sort(orderedQmlIrExpressionsAbsolute.begin(), orderedQmlIrExpressionsAbsolute.end());
qmlcompiler: Add absolute runtime function indices We can transition to absolute indices (within the compilation unit) from the relative indices we already have in each method and script binding. Together with absolute indices, we also need to acknowledge nested closures that some AST elements might have and so also store nested runtime function indices along with the absolute ones Absolute runtime function indices (and the nested ones) map to the indices we store and use within the compilation unit at run time, which are used to dispatch to correct JavaScript call during e.g. binding evaluation - see QQmlEnginePrivate::executeRuntimeFunction() Change-Id: Ieec58fbc36563511bd9763e358cda46c67757fa9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-04-06 07:56:17 +00:00
QCOMPARE(orderedJSScopeExpressionsRelative, orderedQmlIrExpressionsRelative);
QCOMPARE(orderedJSScopeExpressionsAbsolute, orderedQmlIrExpressionsAbsolute);
qmlcompiler: Add relative index for scripts and JS functions Store relative (to scope) index for every Script binding and JavaScript function into the corresponding data structure within QQmlJSScope. We need this at a later phase in qmltc when code generating JavaScript calls into the engine For now, ignore the logic that converts the relative indices stored into the indices pointing to the runtime function table While testing the addition, observe missing cases where we do not record bindings as such and fix that Change-Id: I85030b7937c97f83183f88ae242af3a5f223443c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-03-31 15:29:24 +00:00
}
Fix extension lookup in QQmlJSScope Do not go over extension's base types since this is not how the engine logic work. Instead, only assess the direct extension type when traversing the base type hierarchy. The special cases are value types which still need base type extension traversal (e.g. due to Number and NumberPrototype extensions on primitives) and QObject type itself (we expect to see ObjectPrototype properties / methods of it) Pick-to: 6.3 6.2 Change-Id: I92ba979202b33f16e1a7b948d4f1e79df37f2669 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-03 15:08:37 +00:00
void tst_qqmljsscope::extensions()
{
QQmlJSScope::ConstPtr root = run(u"extensions.qml"_s);
QVERIFY(root);
QVERIFY(root->isFullyResolved());
const auto childScopes = root->childScopes();
Distinguish extensions from extension namespaces in QmlCompiler library QML_{NAMESPACE_}EXTENDED and QML_EXTENDED_NAMESPACE are supposed to behave differently when it comes to visibility of properties, methods, etc. Thus, make it so by actually using different class infos and updating QQmlJSScope. Use a HasExtensionNamespace flag to differentiate between extension and extension namespace (whenever one of them is set) Update the internal search routine that traverses the base types and extensions of the given scope Change-Id: Ifafbb22f831f5b128e431a3e65c514ffdf65eb73 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-06 12:48:22 +00:00
QCOMPARE(childScopes.size(), 5);
Fix extension lookup in QQmlJSScope Do not go over extension's base types since this is not how the engine logic work. Instead, only assess the direct extension type when traversing the base type hierarchy. The special cases are value types which still need base type extension traversal (e.g. due to Number and NumberPrototype extensions on primitives) and QObject type itself (we expect to see ObjectPrototype properties / methods of it) Pick-to: 6.3 6.2 Change-Id: I92ba979202b33f16e1a7b948d4f1e79df37f2669 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-03 15:08:37 +00:00
QCOMPARE(childScopes[0]->baseTypeName(), u"Extended"_s);
QCOMPARE(childScopes[1]->baseTypeName(), u"ExtendedIndirect"_s);
QCOMPARE(childScopes[2]->baseTypeName(), u"ExtendedTwice"_s);
Distinguish extensions from extension namespaces in QmlCompiler library QML_{NAMESPACE_}EXTENDED and QML_EXTENDED_NAMESPACE are supposed to behave differently when it comes to visibility of properties, methods, etc. Thus, make it so by actually using different class infos and updating QQmlJSScope. Use a HasExtensionNamespace flag to differentiate between extension and extension namespace (whenever one of them is set) Update the internal search routine that traverses the base types and extensions of the given scope Change-Id: Ifafbb22f831f5b128e431a3e65c514ffdf65eb73 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-06 12:48:22 +00:00
QCOMPARE(childScopes[3]->baseTypeName(), u"NamespaceExtended"_s);
QCOMPARE(childScopes[4]->baseTypeName(), u"NonNamespaceExtended"_s);
Fix extension lookup in QQmlJSScope Do not go over extension's base types since this is not how the engine logic work. Instead, only assess the direct extension type when traversing the base type hierarchy. The special cases are value types which still need base type extension traversal (e.g. due to Number and NumberPrototype extensions on primitives) and QObject type itself (we expect to see ObjectPrototype properties / methods of it) Pick-to: 6.3 6.2 Change-Id: I92ba979202b33f16e1a7b948d4f1e79df37f2669 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-03 15:08:37 +00:00
QVERIFY(childScopes[0]->isFullyResolved());
QVERIFY(childScopes[1]->isFullyResolved());
QVERIFY(childScopes[2]->isFullyResolved());
Distinguish extensions from extension namespaces in QmlCompiler library QML_{NAMESPACE_}EXTENDED and QML_EXTENDED_NAMESPACE are supposed to behave differently when it comes to visibility of properties, methods, etc. Thus, make it so by actually using different class infos and updating QQmlJSScope. Use a HasExtensionNamespace flag to differentiate between extension and extension namespace (whenever one of them is set) Update the internal search routine that traverses the base types and extensions of the given scope Change-Id: Ifafbb22f831f5b128e431a3e65c514ffdf65eb73 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-06 12:48:22 +00:00
QVERIFY(childScopes[3]->isFullyResolved());
QVERIFY(childScopes[4]->isFullyResolved());
Fix extension lookup in QQmlJSScope Do not go over extension's base types since this is not how the engine logic work. Instead, only assess the direct extension type when traversing the base type hierarchy. The special cases are value types which still need base type extension traversal (e.g. due to Number and NumberPrototype extensions on primitives) and QObject type itself (we expect to see ObjectPrototype properties / methods of it) Pick-to: 6.3 6.2 Change-Id: I92ba979202b33f16e1a7b948d4f1e79df37f2669 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-03 15:08:37 +00:00
QCOMPARE(childScopes[0]->property(u"count"_s).typeName(), u"int"_s);
QCOMPARE(childScopes[1]->property(u"count"_s).typeName(), u"double"_s);
QCOMPARE(childScopes[2]->property(u"count"_s).typeName(), u"int"_s);
QCOMPARE(childScopes[2]->property(u"str"_s).typeName(), u"QString"_s);
Distinguish extensions from extension namespaces in QmlCompiler library QML_{NAMESPACE_}EXTENDED and QML_EXTENDED_NAMESPACE are supposed to behave differently when it comes to visibility of properties, methods, etc. Thus, make it so by actually using different class infos and updating QQmlJSScope. Use a HasExtensionNamespace flag to differentiate between extension and extension namespace (whenever one of them is set) Update the internal search routine that traverses the base types and extensions of the given scope Change-Id: Ifafbb22f831f5b128e431a3e65c514ffdf65eb73 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-06 12:48:22 +00:00
QVERIFY(!childScopes[3]->hasProperty(u"count"_s));
QVERIFY(!childScopes[3]->property(u"count"_s).isValid());
QVERIFY(!childScopes[3]->hasProperty(u"p"_s));
QVERIFY(!childScopes[3]->property(u"p"_s).isValid());
QVERIFY(!childScopes[3]->hasMethod(u"someMethod"_s));
QVERIFY(childScopes[3]->hasEnumeration(u"ExtensionEnum"_s));
QVERIFY(childScopes[3]->hasEnumerationKey(u"Value1"_s));
QVERIFY(childScopes[3]->enumeration(u"ExtensionEnum"_s).isValid());
QCOMPARE(childScopes[3]->defaultPropertyName(), u"objectName"_s);
QCOMPARE(childScopes[3]->parentPropertyName(), u"p"_s);
QVERIFY(!childScopes[3]->hasInterface(u"QQmlParserStatus"_s));
QCOMPARE(childScopes[3]->attachedTypeName(), QString());
QVERIFY(!childScopes[3]->attachedType());
QVERIFY(!childScopes[3]->extensionIsNamespace());
QVERIFY(childScopes[3]->baseType()->extensionIsNamespace());
QVERIFY(childScopes[4]->hasProperty(u"count"_s));
QVERIFY(childScopes[4]->property(u"count"_s).isValid());
QVERIFY(childScopes[4]->hasProperty(u"p"_s));
QVERIFY(childScopes[4]->property(u"p"_s).isValid());
QVERIFY(childScopes[4]->hasMethod(u"someMethod"_s));
QVERIFY(childScopes[4]->hasEnumeration(u"ExtensionEnum"_s));
QVERIFY(childScopes[4]->hasEnumerationKey(u"Value1"_s));
QVERIFY(childScopes[4]->enumeration(u"ExtensionEnum"_s).isValid());
QCOMPARE(childScopes[4]->defaultPropertyName(), u"objectName"_s);
QCOMPARE(childScopes[4]->parentPropertyName(), u"p"_s);
QVERIFY(!childScopes[4]->hasInterface(u"QQmlParserStatus"_s));
QCOMPARE(childScopes[4]->attachedTypeName(), QString());
QVERIFY(!childScopes[4]->attachedType());
auto [owner, ownerKind] = QQmlJSScope::ownerOfProperty(childScopes[4], u"count"_s);
QVERIFY(owner);
QCOMPARE(ownerKind, QQmlJSScope::ExtensionType);
QCOMPARE(owner, childScopes[4]->baseType()->extensionType().scope);
Fix extension lookup in QQmlJSScope Do not go over extension's base types since this is not how the engine logic work. Instead, only assess the direct extension type when traversing the base type hierarchy. The special cases are value types which still need base type extension traversal (e.g. due to Number and NumberPrototype extensions on primitives) and QObject type itself (we expect to see ObjectPrototype properties / methods of it) Pick-to: 6.3 6.2 Change-Id: I92ba979202b33f16e1a7b948d4f1e79df37f2669 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-03 15:08:37 +00:00
}
qqmljsimportvisitor: Fix assert being hit on empty block bindings We previously hit an assert / crashed if we saw an empty script binding. Fixes: QTBUG-103707 Change-Id: I117d984a7d315ecf860d2ada5568637d154ae083 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
2022-05-19 13:41:24 +00:00
void tst_qqmljsscope::emptyBlockBinding()
{
QQmlJSScope::ConstPtr root = run(u"emptyBlockBinding.qml"_s);
QVERIFY(root);
QVERIFY(root->hasOwnPropertyBindings(u"x"_s));
QVERIFY(root->hasOwnPropertyBindings(u"y"_s));
}
qqmljsscope: add ownEnumerationKey() helper method Add a method to find own enumeration keys to qqmljsscope, and also tests for it. Change-Id: Ic40d390dc794c7c2f9eb94b14bf653e3411a1423 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2024-01-24 17:48:38 +00:00
void tst_qqmljsscope::hasOwnEnumerationKeys()
{
QQmlJSScope::ConstPtr root = run(u"extensions.qml"_s);
QVERIFY(root);
QQmlJSScope::ConstPtr extendedDerived = root->childScopes().front();
QVERIFY(extendedDerived);
// test that enumeration keys from base cannot be found
QVERIFY(!extendedDerived->hasOwnEnumerationKey(u"ThisIsTheEnumFromExtended"_s));
QVERIFY(!extendedDerived->hasOwnEnumerationKey(u"ThisIsTheFlagFromExtended"_s));
QQmlJSScope::ConstPtr extended = extendedDerived->baseType();
QVERIFY(extended);
QVERIFY(extended->hasOwnEnumerationKey(u"ThisIsTheEnumFromExtended"_s));
QVERIFY(extended->hasOwnEnumerationKey(u"ThisIsTheFlagFromExtended"_s));
QVERIFY(!extended->hasOwnEnumerationKey(u"ThisIsTheEnumFromExtension"_s));
QVERIFY(!extended->hasOwnEnumerationKey(u"ThisIsTheFlagFromExtension"_s));
}
qqmljsscope: add ownModuleName Allow qqmljsscopes of QML components to have "own" module names, and add a helper method moduleName() that helps retrieve the module name of some (possibly non QML component) qqmljsscope by iterating over its parents. That is required for the renaming of qmlcomponents and allows to check if the qml element to be renamed is defined in the same module as the current module. (It is not allowed to rename a QML component from another module). Task-number: QTBUG-114993 Change-Id: I09d57ec87cfc64de31859b2af6334264c4fa6912 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
2024-04-05 09:04:22 +00:00
void tst_qqmljsscope::ownModuleName()
{
const QString moduleName = u"HelloModule"_s;
QQmlJSScope::ConstPtr root = run(u"ownModuleName.qml"_s);
QVERIFY(root);
QCOMPARE(root->moduleName(), moduleName);
QCOMPARE(root->ownModuleName(), moduleName);
QCOMPARE(root->childScopes().size(), 2);
QQmlJSScope::ConstPtr child = root->childScopes().front();
QVERIFY(child);
// only root and inline components have own module names, but the child should be able to query
// its component's module Name via moduleName()
QCOMPARE(child->ownModuleName(), QString());
QCOMPARE(child->moduleName(), moduleName);
QQmlJSScope::ConstPtr ic = root->childScopes()[1];
QVERIFY(ic);
QCOMPARE(ic->ownModuleName(), moduleName);
QCOMPARE(ic->moduleName(), moduleName);
QQmlJSScope::ConstPtr icChild = ic->childScopes().front();
QVERIFY(icChild);
QCOMPARE(icChild->ownModuleName(), QString());
QCOMPARE(icChild->moduleName(), moduleName);
}
Set bindings on QQmlJSScope after AST traversal We can get into situations when binding creation is problematic due to the relevant scopes being yet unresolved. In particular, this happens when processing attached/group properties script bindings Avoid having this situation by postponing the actual binding setting until after the relavant scopes are resolved (mainly, the binding owner). However, do relevant AST order dependent operations beforehand to avoid accidental errors This commit amends 25098b7a4fdb8920874a817956f659e6393548d2 Fixes: QTBUG-103897 Change-Id: I671955dbe321d03e5f1ab9891cc79dc0a936deda Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 13:18:56 +00:00
void tst_qqmljsscope::resolvedNonUniqueScopes()
{
QQmlJSScope::ConstPtr root = run(u"resolvedNonUniqueScope.qml"_s);
QVERIFY(root);
const auto value = [](const QMultiHash<QString, QQmlJSMetaPropertyBinding> &bindings,
const QString &key) {
return bindings.value(key, QQmlJSMetaPropertyBinding(QQmlJS::SourceLocation {}));
};
{
auto topLevelBindings = root->propertyBindings(u"Component"_s);
QCOMPARE(topLevelBindings.size(), 1);
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(topLevelBindings[0].bindingType(), QQmlSA::BindingType::AttachedProperty);
Set bindings on QQmlJSScope after AST traversal We can get into situations when binding creation is problematic due to the relevant scopes being yet unresolved. In particular, this happens when processing attached/group properties script bindings Avoid having this situation by postponing the actual binding setting until after the relavant scopes are resolved (mainly, the binding owner). However, do relevant AST order dependent operations beforehand to avoid accidental errors This commit amends 25098b7a4fdb8920874a817956f659e6393548d2 Fixes: QTBUG-103897 Change-Id: I671955dbe321d03e5f1ab9891cc79dc0a936deda Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 13:18:56 +00:00
auto componentScope = topLevelBindings[0].attachingType();
auto componentBindings = componentScope->ownPropertyBindings();
QCOMPARE(componentBindings.size(), 2);
auto onCompletedBinding = value(componentBindings, u"onCompleted"_s);
QVERIFY(onCompletedBinding.isValid());
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(onCompletedBinding.bindingType(), QQmlSA::BindingType::Script);
QQmlSA::ScriptBindingKind: Turn into scoped enumeration and remove the Script_ prefix from its entries. This is more aligned with Qt's namings conventions. Pick-to: 6.6 Change-Id: Ie97c2ce204b5532ab6bd6b136145f2a537175fbb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Semih Yavuz <semih.yavuz@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
2023-08-30 08:35:00 +00:00
QCOMPARE(onCompletedBinding.scriptKind(), QQmlSA::ScriptBindingKind::SignalHandler);
Set bindings on QQmlJSScope after AST traversal We can get into situations when binding creation is problematic due to the relevant scopes being yet unresolved. In particular, this happens when processing attached/group properties script bindings Avoid having this situation by postponing the actual binding setting until after the relavant scopes are resolved (mainly, the binding owner). However, do relevant AST order dependent operations beforehand to avoid accidental errors This commit amends 25098b7a4fdb8920874a817956f659e6393548d2 Fixes: QTBUG-103897 Change-Id: I671955dbe321d03e5f1ab9891cc79dc0a936deda Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 13:18:56 +00:00
auto onDestructionBinding = value(componentBindings, u"onDestruction"_s);
QVERIFY(onDestructionBinding.isValid());
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(onDestructionBinding.bindingType(), QQmlSA::BindingType::Script);
Set bindings on QQmlJSScope after AST traversal We can get into situations when binding creation is problematic due to the relevant scopes being yet unresolved. In particular, this happens when processing attached/group properties script bindings Avoid having this situation by postponing the actual binding setting until after the relavant scopes are resolved (mainly, the binding owner). However, do relevant AST order dependent operations beforehand to avoid accidental errors This commit amends 25098b7a4fdb8920874a817956f659e6393548d2 Fixes: QTBUG-103897 Change-Id: I671955dbe321d03e5f1ab9891cc79dc0a936deda Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 13:18:56 +00:00
QCOMPARE(onDestructionBinding.scriptKind(),
QQmlSA::ScriptBindingKind: Turn into scoped enumeration and remove the Script_ prefix from its entries. This is more aligned with Qt's namings conventions. Pick-to: 6.6 Change-Id: Ie97c2ce204b5532ab6bd6b136145f2a537175fbb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Semih Yavuz <semih.yavuz@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
2023-08-30 08:35:00 +00:00
QQmlSA::ScriptBindingKind::SignalHandler);
Set bindings on QQmlJSScope after AST traversal We can get into situations when binding creation is problematic due to the relevant scopes being yet unresolved. In particular, this happens when processing attached/group properties script bindings Avoid having this situation by postponing the actual binding setting until after the relavant scopes are resolved (mainly, the binding owner). However, do relevant AST order dependent operations beforehand to avoid accidental errors This commit amends 25098b7a4fdb8920874a817956f659e6393548d2 Fixes: QTBUG-103897 Change-Id: I671955dbe321d03e5f1ab9891cc79dc0a936deda Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 13:18:56 +00:00
}
{
auto topLevelBindings = root->propertyBindings(u"p"_s);
QCOMPARE(topLevelBindings.size(), 1);
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(topLevelBindings[0].bindingType(), QQmlSA::BindingType::GroupProperty);
Set bindings on QQmlJSScope after AST traversal We can get into situations when binding creation is problematic due to the relevant scopes being yet unresolved. In particular, this happens when processing attached/group properties script bindings Avoid having this situation by postponing the actual binding setting until after the relavant scopes are resolved (mainly, the binding owner). However, do relevant AST order dependent operations beforehand to avoid accidental errors This commit amends 25098b7a4fdb8920874a817956f659e6393548d2 Fixes: QTBUG-103897 Change-Id: I671955dbe321d03e5f1ab9891cc79dc0a936deda Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 13:18:56 +00:00
auto pScope = topLevelBindings[0].groupType();
auto pBindings = pScope->ownPropertyBindings();
QCOMPARE(pBindings.size(), 1);
auto onXChangedBinding = value(pBindings, u"onXChanged"_s);
QVERIFY(onXChangedBinding.isValid());
QQmlSA: Create an abstraction layer for static analysis This patch adds abstractions for QML Elements, Bindings, Methods and Properties. This abstraction layer avoids exposing internal details and should be more suited for static analysis tasks. It is now possible to write qmllint plugins without including private headers. As a drive-by, change tst_qmllint:verifyJsRoot to open files in text mode instead of binary. This fixes an issue where line endings cause issues on Windows. Fixes: QTBUG-102276 Change-Id: I6b6e53f1e0078734a18f3aa51807fbe875b375f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-05 07:30:27 +00:00
QCOMPARE(onXChangedBinding.bindingType(), QQmlSA::BindingType::Script);
QQmlSA::ScriptBindingKind: Turn into scoped enumeration and remove the Script_ prefix from its entries. This is more aligned with Qt's namings conventions. Pick-to: 6.6 Change-Id: Ie97c2ce204b5532ab6bd6b136145f2a537175fbb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Semih Yavuz <semih.yavuz@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
2023-08-30 08:35:00 +00:00
QCOMPARE(onXChangedBinding.scriptKind(), QQmlSA::ScriptBindingKind::SignalHandler);
Set bindings on QQmlJSScope after AST traversal We can get into situations when binding creation is problematic due to the relevant scopes being yet unresolved. In particular, this happens when processing attached/group properties script bindings Avoid having this situation by postponing the actual binding setting until after the relavant scopes are resolved (mainly, the binding owner). However, do relevant AST order dependent operations beforehand to avoid accidental errors This commit amends 25098b7a4fdb8920874a817956f659e6393548d2 Fixes: QTBUG-103897 Change-Id: I671955dbe321d03e5f1ab9891cc79dc0a936deda Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-05-25 13:18:56 +00:00
}
}
qqmltypecompiler: align runtime function table order to qmlcachegen When we write runtime functions to compilation unit at run time, the order of the functions in the unit (often) differs from the order of functions in the unit produced ahead of time by qmlcachegen and friends. Additionally, the order also differs from what qmltc expects (and qmlcompiler library in general) Fix the order by simplifying the procedure of JS code generation when we create the compilation unit at run time: new logic just goes over the objects in the document linearly, instead of relying on bindings (which are known to be out of order w.r.t. AST) Change-Id: I4070b9d061f03c4c76d03120654ad3f30725493a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-01 11:51:12 +00:00
static void
getRuntimeInfoFromCompilationUnit(const QV4::CompiledData::Unit *unit,
QList<const QV4::CompiledData::Function *> &runtimeFunctions)
{
QVERIFY(unit);
for (uint i = 0; i < unit->functionTableSize; ++i) {
const QV4::CompiledData::Function *function = unit->functionAt(i);
QVERIFY(function);
runtimeFunctions << function;
}
}
// Note: this test is here because we never explicitly test qCompileQmlFile()
void tst_qqmljsscope::compilationUnitsAreCompatible()
{
const QString url = u"compilationUnitsCompatibility.qml"_s;
QList<const QV4::CompiledData::Function *> componentFunctions;
QList<const QV4::CompiledData::Function *> cachegenFunctions;
QQmlEngine engine;
QQmlComponent component(&engine);
component.loadUrl(testFileUrl(url));
QVERIFY2(component.isReady(), qPrintable(component.errorString()));
QScopedPointer<QObject> root(component.create());
QVERIFY2(root, qPrintable(component.errorString()));
QQmlComponentPrivate *cPriv = QQmlComponentPrivate::get(&component);
QVERIFY(cPriv);
auto unit = cPriv->compilationUnit;
QVERIFY(unit);
QVERIFY(unit->unitData());
getRuntimeInfoFromCompilationUnit(unit->unitData(), componentFunctions);
if (QTest::currentTestFailed())
return;
QmlIR::Document document(false); // we need QmlIR information here
QVERIFY(run(url, &document));
QtQml: Make base CU a member of ExecutableCompilationUnit We want to re-use the base compilation unit across engines. For that to work it cannot be a slice of the engine-specific ExecutableCompilationUnit. Since CompiledData::CompilationUnit is refcounted on its own now, make it unmovable. Change-Id: I8418c9754d7a07e5210c1e7a7fc69355e1d57807 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-12-21 12:25:11 +00:00
QVERIFY(document.javaScriptCompilationUnit->unitData());
getRuntimeInfoFromCompilationUnit(document.javaScriptCompilationUnit->unitData(),
qqmltypecompiler: align runtime function table order to qmlcachegen When we write runtime functions to compilation unit at run time, the order of the functions in the unit (often) differs from the order of functions in the unit produced ahead of time by qmlcachegen and friends. Additionally, the order also differs from what qmltc expects (and qmlcompiler library in general) Fix the order by simplifying the procedure of JS code generation when we create the compilation unit at run time: new logic just goes over the objects in the document linearly, instead of relying on bindings (which are known to be out of order w.r.t. AST) Change-Id: I4070b9d061f03c4c76d03120654ad3f30725493a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-01 11:51:12 +00:00
cachegenFunctions);
if (QTest::currentTestFailed())
return;
QCOMPARE(cachegenFunctions.size(), componentFunctions.size());
// name index should be fairly unique to distinguish different functions
// within a document. their order must be the same for both qmlcachegen and
// qqmltypecompiler (runtime)
for (qsizetype i = 0; i < cachegenFunctions.size(); ++i)
QCOMPARE(uint(cachegenFunctions[i]->nameIndex), uint(componentFunctions[i]->nameIndex));
}
QQmlSA: Change API for accessing attached types An Element no longer exposes its attached type directly. Instead, the function resolveAttached() was added as an analog to resolveType(). Also, added a test documenting the current attached type resolution behavior. Change-Id: Ib8d6713790f9ce2e2fe36b8620bbbbe36cb23705 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-23 07:21:59 +00:00
void tst_qqmljsscope::attachedTypeResolution_data()
{
QTest::addColumn<bool>("creatable");
QTest::addColumn<QString>("moduleName");
QTest::addColumn<QString>("typeName");
QTest::addColumn<QString>("attachedTypeName");
QTest::addColumn<QString>("propertyOnSelf");
QTest::addColumn<QString>("propertyOnAttached");
QTest::addRow("ListView") << true
<< "QtQuick"
<< "ListView"
<< "QQuickListViewAttached"
<< "orientation"
<< "";
QTest::addRow("Keys") << false
<< "QtQuick"
<< "Keys"
<< "QQuickKeysAttached"
<< "priority"
<< "priority";
}
class TestPass : public QQmlSA::ElementPass
{
public:
TestPass(QQmlSA::PassManager *manager) : QQmlSA::ElementPass(manager) { }
bool shouldRun(const QQmlSA::Element &) override { return true; }
void run(const QQmlSA::Element &) override { }
};
QQmlSA: Remove cruft from public API Methods you can't use should not be visible, and PassManager needs to be Q_DISABLE_COPY_MOVE. Task-number: QTBUG-116682 Change-Id: Ib308bf3a5bac3dd78b52b82b01bc8f2bc13835b3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-10-13 13:42:18 +00:00
using PassManagerPtr = std::unique_ptr<
QQmlSA::PassManager, decltype(&QQmlSA::PassManagerPrivate::deletePassManager)>;
QQmlSA: Change API for accessing attached types An Element no longer exposes its attached type directly. Instead, the function resolveAttached() was added as an analog to resolveType(). Also, added a test documenting the current attached type resolution behavior. Change-Id: Ib8d6713790f9ce2e2fe36b8620bbbbe36cb23705 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-23 07:21:59 +00:00
void tst_qqmljsscope::attachedTypeResolution()
{
QFETCH(bool, creatable);
QFETCH(QString, moduleName);
QFETCH(QString, typeName);
QFETCH(QString, attachedTypeName);
QFETCH(QString, propertyOnSelf);
QFETCH(QString, propertyOnAttached);
std::unique_ptr<QQmlJSLogger> logger = std::make_unique<QQmlJSLogger>();
QFile qmlFile("data/attachedTypeResolution.qml");
if (!qmlFile.open(QIODevice::ReadOnly | QIODevice::Text))
QSKIP("Unable to open qml file");
logger->setCode(qmlFile.readAll());
logger->setFileName(QString(qmlFile.filesystemFileName().string().c_str()));
QQmlJSImporter importer{ { "data" }, nullptr, true };
QStringList defaultImportPaths =
QStringList{ QLibraryInfo::path(QLibraryInfo::QmlImportsPath) };
importer.setImportPaths(defaultImportPaths);
QQmlJSTypeResolver resolver(&importer);
const auto &implicitImportDirectory = QQmlJSImportVisitor::implicitImportDirectory(
logger->fileName(), importer.resourceFileMapper());
QQmlJSImportVisitor v{
QQmlJSScope::create(), &importer, logger.get(), implicitImportDirectory, {}
};
QQmlSA: Remove cruft from public API Methods you can't use should not be visible, and PassManager needs to be Q_DISABLE_COPY_MOVE. Task-number: QTBUG-116682 Change-Id: Ib308bf3a5bac3dd78b52b82b01bc8f2bc13835b3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-10-13 13:42:18 +00:00
PassManagerPtr manager(
QQmlSA::PassManagerPrivate::createPassManager(&v, &resolver),
&QQmlSA::PassManagerPrivate::deletePassManager);
TestPass pass{ manager.get() };
QQmlSA: Change API for accessing attached types An Element no longer exposes its attached type directly. Instead, the function resolveAttached() was added as an analog to resolveType(). Also, added a test documenting the current attached type resolution behavior. Change-Id: Ib8d6713790f9ce2e2fe36b8620bbbbe36cb23705 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-23 07:21:59 +00:00
const auto &resolved = pass.resolveType(moduleName, typeName);
QVERIFY(!resolved.isNull());
const auto &attachedType = pass.resolveAttached(moduleName, typeName);
QVERIFY(!attachedType.isNull());
QQmlSA::Element: Rename internalName to internalId We don't really want to expose the internal name as anything but an opaque unique id for a type. Port some usages of internalName to the normal name() function, and leave a few todo comments in places where we cannot migrate away from it yet. Pick-to: 6.6 Change-Id: Id66a0e2d2dcdad7b54899c67abe8252b9ef2aed9 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
2023-07-03 15:16:56 +00:00
QCOMPARE(attachedType.name(), attachedTypeName);
QQmlSA: Change API for accessing attached types An Element no longer exposes its attached type directly. Instead, the function resolveAttached() was added as an analog to resolveType(). Also, added a test documenting the current attached type resolution behavior. Change-Id: Ib8d6713790f9ce2e2fe36b8620bbbbe36cb23705 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-23 07:21:59 +00:00
if (propertyOnAttached != "") {
QEXPECT_FAIL("Keys", "Keys and QQuickKeysAttached have the same properties", Continue);
QVERIFY(!resolved.hasProperty(propertyOnAttached));
QVERIFY(attachedType.hasProperty(propertyOnAttached));
}
if (propertyOnSelf != "") {
QEXPECT_FAIL("Keys", "Keys and QQuickKeysAttached have the same properties", Continue);
QVERIFY(!attachedType.hasProperty(propertyOnSelf));
}
if (creatable)
QVERIFY(resolved.hasProperty(propertyOnSelf));
}
QQmlSA: Remove Element ctor taking a name, add resolveBuiltinType The Element constructor taking a name would internally create a QQmlJSScope with a matching internal name – without doing any validation that such an internal name would be sensible. Additionally, you could create an Element with it, but you coudln't do anything sensible with it as Element only has a read-only API, and the constructed QQmlJSScope only contains a name. Lastly, we do not really want to expose the internalName as anything more than a transparent id at most. Checking users of the constructor, one quickly finds that the only usage was inside the quick plugin, which needed it to get access to the "function" type; it also relied on "inherits" only checking the internalName. As an alternative, we can provide a resolveBuiltinType which can be used for further checking, and actually returns the correct type with all its methods and attributens, instead of a mock type which happens to work in equality checks. Pick-to: 6.6 Change-Id: I212532053d1b5c898776a564f2011ba17b074079 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-07-03 14:41:51 +00:00
void tst_qqmljsscope::builtinTypeResolution_data()
{
QTest::addColumn<bool>("valid");
QTest::addColumn<QString>("typeName");
QTest::addRow("global_QtObject") << true << "Qt";
QTest::addRow("function") << true << "function";
QTest::addRow("Array") << true << "Array";
QTest::addRow("invalid") << false << "foobar";
QTest::addRow("Number") << true << "Number";
QTest::addRow("bool") << true << "bool";
QTest::addRow("QString") << true << "QString";
}
void tst_qqmljsscope::builtinTypeResolution()
{
QFETCH(bool, valid);
QFETCH(QString, typeName);
QQmlJSImporter importer{ { "data" }, nullptr, true };
QStringList defaultImportPaths =
QStringList{ QLibraryInfo::path(QLibraryInfo::QmlImportsPath) };
importer.setImportPaths(defaultImportPaths);
QQmlJSTypeResolver resolver(&importer);
const auto &implicitImportDirectory = QQmlJSImportVisitor::implicitImportDirectory({}, nullptr);
QQmlJSLogger logger;
QQmlJSImportVisitor v{
QQmlJSScope::create(), &importer, &logger, implicitImportDirectory, {}
};
QQmlSA: Remove cruft from public API Methods you can't use should not be visible, and PassManager needs to be Q_DISABLE_COPY_MOVE. Task-number: QTBUG-116682 Change-Id: Ib308bf3a5bac3dd78b52b82b01bc8f2bc13835b3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-10-13 13:42:18 +00:00
PassManagerPtr manager(
QQmlSA::PassManagerPrivate::createPassManager(&v, &resolver),
&QQmlSA::PassManagerPrivate::deletePassManager);
TestPass pass{ manager.get() };
QQmlSA: Remove Element ctor taking a name, add resolveBuiltinType The Element constructor taking a name would internally create a QQmlJSScope with a matching internal name – without doing any validation that such an internal name would be sensible. Additionally, you could create an Element with it, but you coudln't do anything sensible with it as Element only has a read-only API, and the constructed QQmlJSScope only contains a name. Lastly, we do not really want to expose the internalName as anything more than a transparent id at most. Checking users of the constructor, one quickly finds that the only usage was inside the quick plugin, which needed it to get access to the "function" type; it also relied on "inherits" only checking the internalName. As an alternative, we can provide a resolveBuiltinType which can be used for further checking, and actually returns the correct type with all its methods and attributens, instead of a mock type which happens to work in equality checks. Pick-to: 6.6 Change-Id: I212532053d1b5c898776a564f2011ba17b074079 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-07-03 14:41:51 +00:00
auto element = pass.resolveBuiltinType(typeName);
QCOMPARE(element.isNull(), !valid);
}
QQmlJS: Store method's source location and expose it in QQmlSA This is useful for tooling like Axivion and can help with better error messages. Change-Id: Ic63afd2eeb4ee3627d05303c2518fa90282fb7ab Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-04-02 09:23:56 +00:00
void tst_qqmljsscope::methodAndSignalSourceLocation()
{
QmlIR::Document document(false);
auto jsscope = run(u"methodAndSignalSourceLocation.qml"_s, false);
std::array<std::array<int, 9>, 2> offsetsByLineEnding = {
std::array{ 29, 51, 74, 102, 128, 160, 219, 235, 257 }, // 1 char line endings
std::array{ 32, 55, 79, 108, 135, 168, 231, 248, 271 } // 2 char line endinds
};
// Try to detect the size of line endings as they lead to different source locations
auto offset1 = jsscope->methods("f1")[0].sourceLocation().offset;
QVERIFY(offset1 == 29 || offset1 == 32);
bool oneCharEndings = offset1 == 29;
std::array<int, 9> &offsets = oneCharEndings ? offsetsByLineEnding[0] : offsetsByLineEnding[1];
using namespace QQmlJS;
QCOMPARE(jsscope->methods("f1")[0].sourceLocation(), SourceLocation(offsets[0], 17, 4, 5));
QCOMPARE(jsscope->methods("f2")[0].sourceLocation(), SourceLocation(offsets[1], 18, 5, 5));
QCOMPARE(jsscope->methods("f3")[0].sourceLocation(), SourceLocation(offsets[2], 23, 6, 5));
QCOMPARE(jsscope->methods("f4")[0].sourceLocation(), SourceLocation(offsets[3], 21, 7, 5));
QCOMPARE(jsscope->methods("f5")[0].sourceLocation(), SourceLocation(offsets[4], 27, 8, 5));
QCOMPARE(jsscope->methods("f6")[0].sourceLocation(), SourceLocation(offsets[5], oneCharEndings ? 53 : 55, 9, 5));
QCOMPARE(jsscope->methods("s1")[0].sourceLocation(), SourceLocation(offsets[6], 11, 13, 5));
QCOMPARE(jsscope->methods("s2")[0].sourceLocation(), SourceLocation(offsets[7], 17, 14, 5));
QCOMPARE(jsscope->methods("s3")[0].sourceLocation(), SourceLocation(offsets[8], 28, 15, 5));
}
Add basic test infrastructure for QQmlJSScope There are already cases which couldn't be covered by qmllint (or qmltc) Sometimes what we really want is a deep introspection into the type hierarchy and the only solution is to exercise whatever things like QQmlJSImportVisitor output Change-Id: Ibe40249aec05f04b46c32466265ea704c35e70a4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-11-23 12:44:58 +00:00
QTEST_MAIN(tst_qqmljsscope)
#include "tst_qqmljsscope.moc"