QmlDesigner: Add currentProjectName() to DocumentManager

Also refactor one place that needs it

Change-Id: I9b88a5b8d9a540601897d19628a2d857bc16808d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

3 files changed, 16 insertions, 5 deletions

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index c9aafc48fb..eaf6f89b14 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -312,17 +312,13 @@ void ItemLibraryModel::update([[maybe_unused]] ItemLibraryInfo *itemLibraryInfo,
     beginResetModel();
     clearSections();
 
-    DesignDocument *document = QmlDesignerPlugin::instance()->currentDesignDocument();
-    Utils::FilePath qmlFileName = document->fileName();
-    ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::projectForFile(qmlFileName);
-    QString projectName = project ? project->displayName() : "";
-
     QStringList excludedImports {
         QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1) + ".MaterialBundle",
         QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1) + ".EffectBundle"
     };
 
     // create import sections
+    const QString projectName = DocumentManager::currentProjectName();
     const Imports usedImports = model->usedImports();
     QHash<QString, ItemLibraryImport *> importHash;
     for (const Import &import : model->imports()) {
@@ -364,6 +360,7 @@ void ItemLibraryModel::update([[maybe_unused]] ItemLibraryInfo *itemLibraryInfo,
         itemLibImport->setImportExpanded(loadExpandedState(itemLibImport->importUrl()));
     }
 
+    DesignDocument *document = QmlDesignerPlugin::instance()->currentDesignDocument();
     const bool blockNewImports = document->inFileComponentModelActive();
     const QList<ItemLibraryEntry> itemLibEntries = model->itemLibraryEntries();
     for (const ItemLibraryEntry &entry : itemLibEntries) {
diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp
index 3d173842b4..fcaac762ba 100644
--- a/src/plugins/qmldesigner/documentmanager.cpp
+++ b/src/plugins/qmldesigner/documentmanager.cpp
@@ -358,6 +358,19 @@ Utils::FilePath DocumentManager::currentProjectDirPath()
     return {};
 }
 
+QString DocumentManager::currentProjectName()
+{
+    QTC_ASSERT(QmlDesignerPlugin::instance(), return {});
+
+    if (!QmlDesignerPlugin::instance()->currentDesignDocument())
+        return {};
+
+    Utils::FilePath qmlFileName = QmlDesignerPlugin::instance()->currentDesignDocument()->fileName();
+    ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::projectForFile(qmlFileName);
+
+    return project ? project->displayName() : "";
+}
+
 QStringList DocumentManager::isoIconsQmakeVariableValue(const QString &proPath)
 {
     ProjectExplorer::Node *node = ProjectExplorer::ProjectTree::nodeForFile(Utils::FilePath::fromString(proPath));
diff --git a/src/plugins/qmldesigner/documentmanager.h b/src/plugins/qmldesigner/documentmanager.h
index fc020a2e39..090630e5fe 100644
--- a/src/plugins/qmldesigner/documentmanager.h
+++ b/src/plugins/qmldesigner/documentmanager.h
@@ -48,6 +48,7 @@ public:
     static void addFileToVersionControl(const QString &directoryPath, const QString &newFilePath);
     static Utils::FilePath currentFilePath();
     static Utils::FilePath currentProjectDirPath();
+    static QString currentProjectName();
 
     static QStringList isoIconsQmakeVariableValue(const QString &proPath);
     static bool setIsoIconsQmakeVariableValue(const QString &proPath, const QStringList &value);