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

QmlDesigner: Handle signal overloads

Browse Source 
Signals can be overloaded and we should handle that case.

Task-number: QDS-6669
Change-Id: I70272d90aff11c7705de70f1ed55676813c8b5ff
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Marco Bubke
2022-04-06 20:03:15 +02:00
parent 4e1dc8542a
commit 71366d4c2b
2 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h
View File

@@ -1491,7 +1491,16 @@ private:
void synchronizeSignalDeclarations(TypeId typeId, Storage::SignalDeclarations &signalDeclarations)
{
std::sort(signalDeclarations.begin(), signalDeclarations.end(), [](auto &&first, auto &&second) {
return Sqlite::compare(first.name, second.name) < 0;
auto compare = Sqlite::compare(first.name, second.name);
if (compare == 0) {
Utils::PathString firstSignature{createJson(first.parameters)};
Utils::PathString secondSignature{createJson(second.parameters)};
return Sqlite::compare(firstSignature, secondSignature) < 0;
}
return compare < 0;
});
auto range = selectSignalDeclarationsForTypeIdStatement
@@ -1499,7 +1508,13 @@ private:
auto compareKey = [](const Storage::SignalDeclarationView &view,
const Storage::SignalDeclaration &value) {
return Sqlite::compare(view.name, value.name);
auto nameKey = Sqlite::compare(view.name, value.name);
if (nameKey != 0)
return nameKey;
Utils::PathString valueSignature{createJson(value.parameters)};
return Sqlite::compare(view.signature, valueSignature);
};
auto insert = [&](const Storage::SignalDeclaration &value) {
@@ -1510,14 +1525,7 @@ private:
auto update = [&](const Storage::SignalDeclarationView &view,
const Storage::SignalDeclaration &value) {
Utils::PathString signature{createJson(value.parameters)};
if (signature == view.signature)
return Sqlite::UpdateChange::No;
updateSignalDeclarationStatement.write(&view.id, signature);
return Sqlite::UpdateChange::Update;
return Sqlite::UpdateChange::No;
};
auto remove = [&](const Storage::SignalDeclarationView &view) {
@@ -2465,7 +2473,7 @@ public:
"DELETE FROM functionDeclarations WHERE functionDeclarationId=?", database};
mutable ReadStatement<3, 1> selectSignalDeclarationsForTypeIdStatement{
"SELECT name, signature, signalDeclarationId FROM signalDeclarations WHERE typeId=? ORDER "
"BY name",
"BY name, signature",
database};
mutable ReadStatement<2, 1> selectSignalDeclarationsForTypeIdWithoutSignatureStatement{
"SELECT name, signalDeclarationId FROM signalDeclarations WHERE typeId=? ORDER BY name",

61
tests/unit/unittest/projectstorage-test.cpp
View File

@@ -248,7 +248,7 @@ protected:
Storage::PropertyDeclarationTraits::IsPointer},
Storage::ParameterDeclaration{"arg3", "string"}}}},
{Storage::SignalDeclaration{"execute", {Storage::ParameterDeclaration{"arg", ""}}},
Storage::SignalDeclaration{"value0s",
Storage::SignalDeclaration{"values",
{Storage::ParameterDeclaration{"arg1", "int"},
Storage::ParameterDeclaration{
"arg2", "QObject", Storage::PropertyDeclarationTraits::IsPointer},
@@ -1744,6 +1744,65 @@ TEST_F(ProjectStorage, SynchronizeTypesAddSignalDeclaration)
Eq(package.types[0].signalDeclarations[2]))))));
}
TEST_F(ProjectStorage, SynchronizeTypesAddSignalDeclarationsWithOverloads)
{
auto package{createSimpleSynchronizationPackage()};
package.types[0].signalDeclarations.push_back(Storage::SignalDeclaration{"execute", {}});
storage.synchronize(package);
ASSERT_THAT(storage.fetchTypes(),
Contains(
AllOf(IsStorageType(sourceId1,
"QQuickItem",
fetchTypeId(sourceId2, "QObject"),
TypeAccessSemantics::Reference),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(package.types[0].signalDeclarations[0]),
Eq(package.types[0].signalDeclarations[1]),
Eq(package.types[0].signalDeclarations[2]))))));
}
TEST_F(ProjectStorage, SynchronizeTypesSignalDeclarationsAddingOverload)
{
auto package{createSimpleSynchronizationPackage()};
storage.synchronize(package);
package.types[0].signalDeclarations.push_back(Storage::SignalDeclaration{"execute", {}});
storage.synchronize(package);
ASSERT_THAT(storage.fetchTypes(),
Contains(
AllOf(IsStorageType(sourceId1,
"QQuickItem",
fetchTypeId(sourceId2, "QObject"),
TypeAccessSemantics::Reference),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(package.types[0].signalDeclarations[0]),
Eq(package.types[0].signalDeclarations[1]),
Eq(package.types[0].signalDeclarations[2]))))));
}
TEST_F(ProjectStorage, SynchronizeTypesSignalDeclarationsRemovingOverload)
{
auto package{createSimpleSynchronizationPackage()};
package.types[0].signalDeclarations.push_back(Storage::SignalDeclaration{"execute", {}});
storage.synchronize(package);
package.types[0].signalDeclarations.pop_back();
storage.synchronize(package);
ASSERT_THAT(storage.fetchTypes(),
Contains(
AllOf(IsStorageType(sourceId1,
"QQuickItem",
fetchTypeId(sourceId2, "QObject"),
TypeAccessSemantics::Reference),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(package.types[0].signalDeclarations[0]),
Eq(package.types[0].signalDeclarations[1]))))));
}
TEST_F(ProjectStorage, SynchronizeTypesAddEnumerationDeclarations)
{
auto package{createSimpleSynchronizationPackage()};