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

QmlDesigner: Add local directory to import paths

Browse Source 
Change-Id: I4d623d1ed9667a221016c2dd2267d47a9a9ef2c5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2024-06-11 17:30:20 +02:00
parent b2c85538b1
commit a49ae43848
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qmldesigner/designercore/model/model.cpp
View File

@@ -166,15 +166,25 @@ void ModelPrivate::detachAllViews()
namespace { namespace {
Storage::Imports createStorageImports(const Imports &imports, Storage::Imports createStorageImports(const Imports &imports,
Utils::SmallStringView localDirectoryPath,
ProjectStorageType &projectStorage, ProjectStorageType &projectStorage,
SourceId fileId) SourceId fileId)
{ {
return Utils::transform<Storage::Imports>(imports, [&](const Import &import) { using Storage::ModuleKind;
using Storage::ModuleKind; Storage::Imports storageImports;
storageImports.reserve(Utils::usize(imports) + 1);
for (const Import &import : imports) {
auto moduleKind = import.isLibraryImport() ? ModuleKind::QmlLibrary : ModuleKind::PathLibrary; auto moduleKind = import.isLibraryImport() ? ModuleKind::QmlLibrary : ModuleKind::PathLibrary;
auto moduleId = projectStorage.moduleId(Utils::SmallString{import.url()}, moduleKind); auto moduleId = projectStorage.moduleId(Utils::SmallString{import.url()}, moduleKind);
return Storage::Import{moduleId, import.majorVersion(), import.minorVersion(), fileId}; storageImports.emplace_back(moduleId, import.majorVersion(), import.minorVersion(), fileId);
}); }
auto localDirectoryModuleId = projectStorage.moduleId(localDirectoryPath, ModuleKind::PathLibrary);
storageImports.emplace_back(localDirectoryModuleId, Storage::Version{}, fileId);
return storageImports;
} }
} // namespace } // namespace
@@ -196,7 +206,7 @@ void ModelPrivate::changeImports(Imports toBeAddedImports, Imports toBeRemovedIm
if (!removedImports.isEmpty() || !allNewAddedImports.isEmpty()) { if (!removedImports.isEmpty() || !allNewAddedImports.isEmpty()) {
if (useProjectStorage()) { if (useProjectStorage()) {
auto imports = createStorageImports(m_imports, *projectStorage, m_sourceId); auto imports = createStorageImports(m_imports, m_localPath, *projectStorage, m_sourceId);
projectStorage->synchronizeDocumentImports(std::move(imports), m_sourceId); projectStorage->synchronizeDocumentImports(std::move(imports), m_sourceId);
} }
notifyImportsChanged(allNewAddedImports, removedImports); notifyImportsChanged(allNewAddedImports, removedImports);
@@ -265,7 +275,10 @@ void ModelPrivate::setFileUrl(const QUrl &fileUrl)
if (oldPath != fileUrl) { if (oldPath != fileUrl) {
m_fileUrl = fileUrl; m_fileUrl = fileUrl;
if constexpr (useProjectStorage()) { if constexpr (useProjectStorage()) {
m_sourceId = pathCache->sourceId(SourcePath{fileUrl.path()}); auto path = fileUrl.path();
m_sourceId = pathCache->sourceId(SourcePath{path});
auto found = std::find(path.rbegin(), path.rend(), u'/').base();
m_localPath = Utils::PathString{QStringView{path.begin(), std::prev(found)}};
} }
for (const QPointer<AbstractView> &view : std::as_const(m_viewList)) for (const QPointer<AbstractView> &view : std::as_const(m_viewList))

1
src/plugins/qmldesigner/designercore/model/model_p.h
View File

@@ -355,6 +355,7 @@ private:
InternalNodePointer m_currentTimelineNode; InternalNodePointer m_currentTimelineNode;
std::unique_ptr<ModelResourceManagementInterface> m_resourceManagement; std::unique_ptr<ModelResourceManagementInterface> m_resourceManagement;
QUrl m_fileUrl; QUrl m_fileUrl;
Utils::PathString m_localPath;
SourceId m_sourceId; SourceId m_sourceId;
QPointer<RewriterView> m_rewriterView; QPointer<RewriterView> m_rewriterView;
QPointer<NodeInstanceView> m_nodeInstanceView; QPointer<NodeInstanceView> m_nodeInstanceView;