QmlDesigner: Add unimportFinished signal to BundleImporter

Change-Id: I6d7ab5716f1bf6fe48f454d0c95c29ebd5d181de
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

2 files changed, 39 insertions, 15 deletions

diff --git a/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp b/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
index 67559e0829..77c2c5ed30 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
@@ -97,9 +97,10 @@ QString BundleImporter::importComponent(const QString &qmlFile,
     FilePath qmlSourceFile = bundleImportPath.resolvePath(FilePath::fromString(qmlFile));
     const bool qmlFileExists = qmlSourceFile.exists();
     const QString qmlType = qmlSourceFile.baseName();
-    m_pendingTypes.append(QStringLiteral("%1.%2.%3")
-                          .arg(QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1),
-                               m_bundleId, qmlType));
+    const QString fullTypeName = QStringLiteral("%1.%2.%3")
+            .arg(QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1), m_bundleId, qmlType);
+    if (m_pendingTypes.contains(fullTypeName) && !m_pendingTypes[fullTypeName])
+        return QStringLiteral("Unable to import while unimporting the same type: '%1'").arg(fullTypeName);
     if (!qmldirContent.contains(qmlFile)) {
         qmldirContent.append(qmlType);
         qmldirContent.append(" 1.0 ");
@@ -162,6 +163,7 @@ QString BundleImporter::importComponent(const QString &qmlFile,
             m_importAddPending = true;
         }
     }
+    m_pendingTypes.insert(fullTypeName, true);
     m_importTimerCount = 0;
     m_importTimer.start();
 
@@ -175,8 +177,16 @@ void BundleImporter::handleImportTimer()
         m_fullReset = false;
         m_importAddPending = false;
         m_importTimerCount = 0;
-        m_pendingTypes.clear();
-        emit importFinished({});
+
+        // Emit dummy finished signals for all pending types
+        const QStringList pendingTypes = m_pendingTypes.keys();
+        for (const QString &pendingType : pendingTypes) {
+            m_pendingTypes.remove(pendingType);
+            if (m_pendingTypes[pendingType])
+                emit importFinished({});
+            else
+                emit unimportFinished({});
+        }
     };
 
     auto doc = QmlDesignerPlugin::instance()->currentDesignDocument();
@@ -210,12 +220,17 @@ void BundleImporter::handleImportTimer()
     }
 
     // Detect when the code model has the new material(s) fully available
-    const QStringList pendingTypes = m_pendingTypes;
+    const QStringList pendingTypes = m_pendingTypes.keys();
     for (const QString &pendingType : pendingTypes) {
         NodeMetaInfo metaInfo = model->metaInfo(pendingType.toUtf8());
-        if (metaInfo.isValid() && !metaInfo.superClasses().isEmpty()) {
-            m_pendingTypes.removeAll(pendingType);
-            emit importFinished(metaInfo);
+        const bool isImport = m_pendingTypes[pendingType];
+        const bool typeComplete = metaInfo.isValid() && !metaInfo.superClasses().isEmpty();
+        if (isImport == typeComplete) {
+            m_pendingTypes.remove(pendingType);
+            if (isImport)
+                emit importFinished(metaInfo);
+            else
+                emit unimportFinished(metaInfo);
         }
     }
 
@@ -257,14 +272,14 @@ QString BundleImporter::unimportComponent(const QString &qmlFile)
 {
     FilePath bundleImportPath = resolveBundleImportPath();
     if (bundleImportPath.isEmpty())
-        return "Failed to resolve bundle import folder";
+        return QStringLiteral("Failed to resolve bundle import folder for: '%1'").arg(qmlFile);
 
     if (!bundleImportPath.exists())
-        return {};
+        return QStringLiteral("Unable to find bundle path: '%1'").arg(bundleImportPath.toString());
 
     FilePath qmlFilePath = bundleImportPath.resolvePath(qmlFile);
     if (!qmlFilePath.exists())
-        return {};
+        return QStringLiteral("Unable to find specified file: '%1'").arg(qmlFilePath.toString());
 
     QStringList removedFiles;
     removedFiles.append(qmlFile);
@@ -272,9 +287,15 @@ QString BundleImporter::unimportComponent(const QString &qmlFile)
     FilePath qmldirPath = bundleImportPath.resolvePath(QStringLiteral("qmldir"));
     QByteArray qmldirContent = qmldirPath.fileContents();
     QByteArray newContent;
+
+    QString qmlType = qmlFilePath.baseName();
+    const QString fullTypeName = QStringLiteral("%1.%2.%3")
+            .arg(QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1), m_bundleId, qmlType);
+    if (m_pendingTypes.contains(fullTypeName) && m_pendingTypes[fullTypeName])
+        return QStringLiteral("Unable to unimport while importing the same type: '%1'").arg(fullTypeName);
+
     if (!qmldirContent.isEmpty()) {
-        QByteArray qmlType = qmlFilePath.baseName().toUtf8();
-        int typeIndex = qmldirContent.indexOf(qmlType);
+        int typeIndex = qmldirContent.indexOf(qmlType.toUtf8());
         if (typeIndex != -1) {
             int newLineIndex = qmldirContent.indexOf('\n', typeIndex);
             newContent = qmldirContent.left(typeIndex);
@@ -287,6 +308,8 @@ QString BundleImporter::unimportComponent(const QString &qmlFile)
         }
     }
 
+    m_pendingTypes.insert(fullTypeName, false);
+
     QVariantHash assetRefMap = loadAssetRefMap(bundleImportPath);
     bool writeAssetRefs = false;
     const auto keys = assetRefMap.keys();
diff --git a/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.h b/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.h
index b22d0edd59..599d4d8e50 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.h
+++ b/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.h
@@ -57,6 +57,7 @@ signals:
     // asynchronous part of the import. In this case all remaining pending imports have been
     // terminated, and will not receive separate importFinished notifications.
     void importFinished(const QmlDesigner::NodeMetaInfo &metaInfo);
+    void unimportFinished(const QmlDesigner::NodeMetaInfo &metaInfo);
 
 private:
     void handleImportTimer();
@@ -72,7 +73,7 @@ private:
     int m_importTimerCount = 0;
     bool m_importAddPending = false;
     bool m_fullReset = false;
-    QStringList m_pendingTypes;
+    QHash<QString, bool> m_pendingTypes; // <type, isImport>
 };
 
 } // namespace QmlDesigner::Internal