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

QmlDesigner: Concat source ids into one struct

Browse Source 
SourceIdsData is reducing the parameter count and later shares the
initialization the watcher notifier.

Task-number: QDS-9479
Change-Id: I30fca678a857821a376906071d6c219c4dd2e4b7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2023-03-21 14:02:55 +01:00
parent 492c2f89c4
commit f07e8a5918
2 changed files with 161 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp
View File

@@ -60,11 +60,11 @@ ProjectStorageUpdater::Components createComponents(
ModuleId moduleId,
ModuleId pathModuleId,
FileSystemInterface &fileSystem,
const QString &directory)
const Utils::PathString &directory)
{
ProjectStorageUpdater::Components components;
auto qmlFileNames = fileSystem.qmlFileNames(directory);
auto qmlFileNames = fileSystem.qmlFileNames(QString{directory});
components.reserve(static_cast<std::size_t>(qmlDirParserComponents.size() + qmlFileNames.size()));
@@ -166,53 +166,34 @@ void ProjectStorageUpdater::update(QStringList directories,
ProjectPartId projectPartId)
{
Storage::Synchronization::SynchronizationPackage package;
SourceIds notUpdatedFileStatusSourceIds;
SourceIds notUpdatedSourceIds;
SourceIdsData sourceIdsData{static_cast<std::size_t>(directories.size())};
std::vector<IdPaths> idPaths;
idPaths.reserve(2);
SourceIds watchedDirectorySourceIds;
watchedDirectorySourceIds.reserve(directories.size());
SourceIds watchedQmldirSourceIds;
watchedQmldirSourceIds.reserve(directories.size());
SourceIds watchedQmlSourceIds;
watchedQmldirSourceIds.reserve(directories.size() * 100);
SourceIds watchedQmltypesSourceIds;
watchedQmltypesSourceIds.reserve(directories.size());
idPaths.reserve(4);
updateDirectories(directories,
package,
notUpdatedFileStatusSourceIds,
notUpdatedSourceIds,
watchedDirectorySourceIds,
watchedQmldirSourceIds,
watchedQmlSourceIds,
watchedQmltypesSourceIds);
updateQmlTypes(qmlTypesPaths,
package,
notUpdatedFileStatusSourceIds,
notUpdatedSourceIds,
watchedQmltypesSourceIds);
updateDirectories(directories, package, sourceIdsData);
updateQmlTypes(qmlTypesPaths, package, sourceIdsData);
package.updatedSourceIds = filterNotUpdatedSourceIds(std::move(package.updatedSourceIds),
std::move(notUpdatedSourceIds));
std::move(sourceIdsData.notUpdatedSourceIds));
package.updatedFileStatusSourceIds = filterNotUpdatedSourceIds(
std::move(package.updatedFileStatusSourceIds), std::move(notUpdatedFileStatusSourceIds));
std::move(package.updatedFileStatusSourceIds),
std::move(sourceIdsData.notUpdatedFileStatusSourceIds));
m_projectStorage.synchronize(std::move(package));
idPaths.push_back({projectPartId, SourceType::Directory, std::move(watchedDirectorySourceIds)});
idPaths.push_back({projectPartId, SourceType::QmlDir, std::move(watchedQmldirSourceIds)});
idPaths.push_back({projectPartId, SourceType::Qml, std::move(watchedQmlSourceIds)});
idPaths.push_back({projectPartId, SourceType::QmlTypes, std::move(watchedQmltypesSourceIds)});
idPaths.push_back(
{projectPartId, SourceType::Directory, std::move(sourceIdsData.watchedDirectorySourceIds)});
idPaths.push_back(
{projectPartId, SourceType::QmlDir, std::move(sourceIdsData.watchedQmldirSourceIds)});
idPaths.push_back({projectPartId, SourceType::Qml, std::move(sourceIdsData.watchedQmlSourceIds)});
idPaths.push_back(
{projectPartId, SourceType::QmlTypes, std::move(sourceIdsData.watchedQmltypesSourceIds)});
m_pathWatcher.updateIdPaths(idPaths);
}
void ProjectStorageUpdater::updateQmlTypes(const QStringList &qmlTypesPaths,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmltypesSourceIds)
SourceIdsData &sourceIdsData)
{
if (qmlTypesPaths.empty())
return;
@@ -221,7 +202,7 @@ void ProjectStorageUpdater::updateQmlTypes(const QStringList &qmlTypesPaths,
for (const QString &qmlTypesPath : qmlTypesPaths) {
SourceId sourceId = m_pathCache.sourceId(SourcePath{qmlTypesPath});
watchedQmltypesSourceIds.push_back(sourceId);
sourceIdsData.watchedQmltypesSourceIds.push_back(sourceId);
Storage::Synchronization::ProjectData projectData{sourceId,
sourceId,
@@ -231,8 +212,7 @@ void ProjectStorageUpdater::updateQmlTypes(const QStringList &qmlTypesPaths,
FileState state = parseTypeInfo(projectData,
Utils::PathString{qmlTypesPath},
package,
notUpdatedFileStatusSourceIds,
notUpdatedSourceIds);
sourceIdsData);
if (state == FileState::Changed)
package.projectDatas.push_back(std::move(projectData));
@@ -255,34 +235,28 @@ ProjectStorageUpdater::FileState combineState(FileStates... fileStates)
void ProjectStorageUpdater::updateDirectories(const QStringList &directories,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedDirectorySourceIds,
SourceIds &watchedQmldirSourceIds,
SourceIds &watchedQmlSourceIds,
SourceIds &watchedQmltypesSourceIds)
SourceIdsData &sourceIdsData)
{
for (const QString &directory : directories)
updateDirectory({directory}, package, sourceIdsData);
}
for (const QString &directory : directories) {
Utils::PathString directoryPath = directory;
SourcePath qmldirSourcePath{directory + "/qmldir"};
void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPath,
Storage::Synchronization::SynchronizationPackage &package,
SourceIdsData &sourceIdsData)
{
SourcePath qmldirSourcePath{directoryPath + "/qmldir"};
auto [directoryId, qmlDirSourceId] = m_pathCache.sourceContextAndSourceId(qmldirSourcePath);
SourcePath directorySourcePath{directory + "/."};
SourcePath directorySourcePath{directoryPath + "/."};
auto directorySourceId = m_pathCache.sourceId(directorySourcePath);
auto directoryState = fileState(directorySourceId,
package.fileStatuses,
package.updatedFileStatusSourceIds,
notUpdatedFileStatusSourceIds);
auto directoryState = fileState(directorySourceId, package, sourceIdsData);
if (directoryState != FileState::NotExists)
watchedDirectorySourceIds.push_back(directorySourceId);
sourceIdsData.watchedDirectorySourceIds.push_back(directorySourceId);
auto qmldirState = fileState(qmlDirSourceId,
package.fileStatuses,
package.updatedFileStatusSourceIds,
notUpdatedFileStatusSourceIds);
auto qmldirState = fileState(qmlDirSourceId, package, sourceIdsData);
if (qmldirState != FileState::NotExists)
watchedQmldirSourceIds.push_back(qmlDirSourceId);
sourceIdsData.watchedQmldirSourceIds.push_back(qmlDirSourceId);
switch (combineState(directoryState, qmldirState)) {
case FileState::Changed: {
@@ -321,29 +295,20 @@ void ProjectStorageUpdater::updateDirectories(const QStringList &directories,
directoryPath,
cppModuleId,
package,
notUpdatedFileStatusSourceIds,
notUpdatedSourceIds,
watchedQmltypesSourceIds);
sourceIdsData);
}
parseQmlComponents(
createComponents(parser.components(), moduleId, pathModuleId, m_fileSystem, directory),
createComponents(parser.components(), moduleId, pathModuleId, m_fileSystem, directoryPath),
directorySourceId,
directoryId,
package,
notUpdatedFileStatusSourceIds,
notUpdatedSourceIds,
watchedQmlSourceIds,
sourceIdsData,
qmldirState);
package.updatedProjectSourceIds.push_back(directorySourceId);
break;
}
case FileState::NotChanged: {
parseProjectDatas(m_projectStorage.fetchProjectDatas(directorySourceId),
package,
notUpdatedFileStatusSourceIds,
notUpdatedSourceIds,
watchedQmlSourceIds,
watchedQmltypesSourceIds);
parseProjectDatas(m_projectStorage.fetchProjectDatas(directorySourceId), package, sourceIdsData);
break;
}
case FileState::NotExists: {
@@ -360,11 +325,9 @@ void ProjectStorageUpdater::updateDirectories(const QStringList &directories,
break;
}
}
}
}
void ProjectStorageUpdater::pathsWithIdsChanged([[maybe_unused]] const std::vector<IdPaths> &idPaths)
{}
void ProjectStorageUpdater::pathsWithIdsChanged([[maybe_unused]] const std::vector<IdPaths> &) {}
void ProjectStorageUpdater::pathsChanged(const SourceIds &) {}
@@ -375,16 +338,14 @@ void ProjectStorageUpdater::parseTypeInfos(const QStringList &typeInfos,
Utils::SmallStringView directoryPath,
ModuleId moduleId,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmlSourceIds)
SourceIdsData &sourceIdData)
{
for (const QString &typeInfo : typeInfos) {
Utils::PathString qmltypesPath = Utils::PathString::join(
{directoryPath, "/", Utils::SmallString{typeInfo}});
SourceId sourceId = m_pathCache.sourceId(SourcePathView{qmltypesPath});
watchedQmlSourceIds.push_back(sourceId);
sourceIdData.watchedQmltypesSourceIds.push_back(sourceId);
addDependencies(package.moduleDependencies,
sourceId,
@@ -395,38 +356,27 @@ void ProjectStorageUpdater::parseTypeInfos(const QStringList &typeInfos,
auto projectData = package.projectDatas.emplace_back(
directorySourceId, sourceId, moduleId, Storage::Synchronization::FileType::QmlTypes);
parseTypeInfo(projectData,
qmltypesPath,
package,
notUpdatedFileStatusSourceIds,
notUpdatedSourceIds);
parseTypeInfo(projectData, qmltypesPath, package, sourceIdData);
}
}
void ProjectStorageUpdater::parseProjectDatas(const Storage::Synchronization::ProjectDatas &projectDatas,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmlSourceIds,
SourceIds &watchedQmltypesSourceIds)
SourceIdsData &sourceIdData)
{
for (const Storage::Synchronization::ProjectData &projectData : projectDatas) {
switch (projectData.fileType) {
case Storage::Synchronization::FileType::QmlTypes: {
watchedQmltypesSourceIds.push_back(projectData.sourceId);
sourceIdData.watchedQmltypesSourceIds.push_back(projectData.sourceId);
auto qmltypesPath = m_pathCache.sourcePath(projectData.sourceId);
parseTypeInfo(projectData,
qmltypesPath,
package,
notUpdatedFileStatusSourceIds,
notUpdatedSourceIds);
parseTypeInfo(projectData, qmltypesPath, package, sourceIdData);
break;
}
case Storage::Synchronization::FileType::QmlDocument: {
watchedQmlSourceIds.push_back(projectData.sourceId);
sourceIdData.watchedQmlSourceIds.push_back(projectData.sourceId);
parseQmlComponent(projectData.sourceId, package, notUpdatedFileStatusSourceIds);
parseQmlComponent(projectData.sourceId, package, sourceIdData);
}
};
}
@@ -435,13 +385,9 @@ void ProjectStorageUpdater::parseProjectDatas(const Storage::Synchronization::Pr
auto ProjectStorageUpdater::parseTypeInfo(const Storage::Synchronization::ProjectData &projectData,
Utils::SmallStringView qmltypesPath,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds) -> FileState
SourceIdsData &sourceIdData) -> FileState
{
auto state = fileState(projectData.sourceId,
package.fileStatuses,
package.updatedFileStatusSourceIds,
notUpdatedFileStatusSourceIds);
auto state = fileState(projectData.sourceId, package, sourceIdData);
switch (state) {
case FileState::Changed: {
package.updatedSourceIds.push_back(projectData.sourceId);
@@ -451,7 +397,7 @@ auto ProjectStorageUpdater::parseTypeInfo(const Storage::Synchronization::Projec
break;
}
case FileState::NotChanged: {
notUpdatedSourceIds.push_back(projectData.sourceId);
sourceIdData.notUpdatedSourceIds.push_back(projectData.sourceId);
break;
}
case FileState::NotExists:
@@ -467,9 +413,7 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil
Storage::Synchronization::ExportedTypes exportedTypes,
SourceId directorySourceId,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmlSourceIds,
SourceIdsData &sourceIdData,
FileState qmldirState)
{
if (std::find(relativeFilePath.begin(), relativeFilePath.end(), '+') != relativeFilePath.end())
@@ -479,17 +423,14 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil
SourceId sourceId = m_pathCache.sourceId(SourcePathView{qmlFilePath});
Storage::Synchronization::Type type;
auto state = fileState(sourceId,
package.fileStatuses,
package.updatedFileStatusSourceIds,
notUpdatedFileStatusSourceIds);
auto state = fileState(sourceId, package, sourceIdData);
watchedQmlSourceIds.push_back(sourceId);
sourceIdData.watchedQmlSourceIds.push_back(sourceId);
switch (state) {
case FileState::NotChanged:
if (qmldirState == FileState::NotExists) {
notUpdatedSourceIds.emplace_back(sourceId);
sourceIdData.notUpdatedSourceIds.emplace_back(sourceId);
package.projectDatas.emplace_back(directorySourceId,
sourceId,
ModuleId{},
@@ -524,12 +465,9 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil
void ProjectStorageUpdater::parseQmlComponent(SourceId sourceId,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds)
SourceIdsData &sourceIdData)
{
auto state = fileState(sourceId,
package.fileStatuses,
package.updatedFileStatusSourceIds,
notUpdatedFileStatusSourceIds);
auto state = fileState(sourceId, package, sourceIdData);
if (state != FileState::Changed)
return;
@@ -588,9 +526,7 @@ void ProjectStorageUpdater::parseQmlComponents(Components components,
SourceId directorySourceId,
SourceContextId directoryId,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmlSourceIds,
SourceIdsData &sourceIdsData,
FileState qmldirState)
{
std::sort(components.begin(), components.end(), [](auto &&first, auto &&second) {
@@ -607,36 +543,34 @@ void ProjectStorageUpdater::parseQmlComponents(Components components,
createExportedTypes(componentsWithSameFileName),
directorySourceId,
package,
notUpdatedFileStatusSourceIds,
notUpdatedSourceIds,
watchedQmlSourceIds,
sourceIdsData,
qmldirState);
};
rangeForTheSameFileName(components, callback);
}
ProjectStorageUpdater::FileState ProjectStorageUpdater::fileState(SourceId sourceId,
FileStatuses &fileStatuses,
SourceIds &updatedSourceIds,
SourceIds &notUpdatedSourceIds) const
ProjectStorageUpdater::FileState ProjectStorageUpdater::fileState(
SourceId sourceId,
Storage::Synchronization::SynchronizationPackage &package,
SourceIdsData &sourceIdData) const
{
auto currentFileStatus = m_fileStatusCache.find(sourceId);
if (!currentFileStatus.isValid()) {
updatedSourceIds.push_back(sourceId);
package.updatedFileStatusSourceIds.push_back(sourceId);
return FileState::NotExists;
}
auto projectStorageFileStatus = m_projectStorage.fetchFileStatus(sourceId);
if (!projectStorageFileStatus.isValid() || projectStorageFileStatus != currentFileStatus) {
fileStatuses.push_back(currentFileStatus);
updatedSourceIds.push_back(sourceId);
package.fileStatuses.push_back(currentFileStatus);
package.updatedFileStatusSourceIds.push_back(sourceId);
return FileState::Changed;
}
notUpdatedSourceIds.push_back(sourceId);
sourceIdData.notUpdatedFileStatusSourceIds.push_back(sourceId);
return FileState::NotChanged;
}

63
src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.h
View File

@@ -97,19 +97,37 @@ public:
};
private:
struct SourceIdsData
{
SourceIdsData(std::size_t reserve)
{
notUpdatedFileStatusSourceIds.reserve(reserve * 30);
notUpdatedSourceIds.reserve(reserve * 30);
watchedDirectorySourceIds.reserve(reserve);
watchedQmldirSourceIds.reserve(reserve);
watchedQmlSourceIds.reserve(reserve * 30);
watchedQmltypesSourceIds.reserve(reserve * 30);
}
SourceIds notUpdatedFileStatusSourceIds;
SourceIds notUpdatedSourceIds;
SourceIds watchedDirectorySourceIds;
SourceIds watchedQmldirSourceIds;
SourceIds watchedQmlSourceIds;
SourceIds watchedQmltypesSourceIds;
};
void updateQmlTypes(const QStringList &qmlTypesPaths,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmltypesSourceIds);
SourceIdsData &sourceIdData);
void updateDirectories(const QStringList &directories,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedDirectorySourceIds,
SourceIds &watchedQmldirSourceIds,
SourceIds &watchedQmlSourceIds,
SourceIds &watchedQmltypesSourceIds);
SourceIdsData &sourceIdData);
void updateDirectory(const Utils::PathString &directory,
Storage::Synchronization::SynchronizationPackage &package,
SourceIdsData &sourceIdData);
void parseTypeInfos(const QStringList &typeInfos,
const QList<QmlDirParser::Import> &qmldirDependencies,
@@ -118,45 +136,34 @@ private:
Utils::SmallStringView directoryPath,
ModuleId moduleId,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmlSourceIds);
SourceIdsData &sourceIdData);
void parseProjectDatas(const Storage::Synchronization::ProjectDatas &projectDatas,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmlSourceIds,
SourceIds &watchedQmltypesSourceIds);
SourceIdsData &sourceIdData);
FileState parseTypeInfo(const Storage::Synchronization::ProjectData &projectData,
Utils::SmallStringView qmltypesPath,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds);
SourceIdsData &sourceIdData);
void parseQmlComponents(Components components,
SourceId directorySourceId,
SourceContextId directoryId,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmlSourceIds,
SourceIdsData &sourceIdData,
FileState qmldirState);
void parseQmlComponent(Utils::SmallStringView fileName,
Utils::SmallStringView directory,
Storage::Synchronization::ExportedTypes exportedTypes,
SourceId directorySourceId,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds,
SourceIds &notUpdatedSourceIds,
SourceIds &watchedQmlSourceIds,
SourceIdsData &sourceIdData,
FileState qmldirState);
void parseQmlComponent(SourceId sourceId,
Storage::Synchronization::SynchronizationPackage &package,
SourceIds &notUpdatedFileStatusSourceIds);
SourceIdsData &sourceIdData);
FileState fileState(SourceId sourceId,
FileStatuses &fileStatuses,
SourceIds &updatedSourceIds,
SourceIds &notUpdatedSourceIds) const;
Storage::Synchronization::SynchronizationPackage &package,
SourceIdsData &sourceIdData) const;
private:
FileSystemInterface &m_fileSystem;