QmlDesigner: Refactoring ModelNode::setId

Add ModelNode::setIdWithoutRefactoring for changes without rewriter
interaction and change the rewriter to use it.
Rename ModelNode::setId to ModelNode::setIdWithRefactoring and add the
refactoring capabilities.

Change-Id: Ia5fba19bd2eeb034d525e92f39d30954e83fa747
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp

@@ -168,7 +168,7 @@ void TabViewDesignerAction::addNewTab()
                                                                                        tabViewModelNode.majorVersion(),
                                                                                        tabViewModelNode.minorVersion(),
                                                                                        propertyList);
-                newTabModelNode.setId(newTabModelNode.view()->generateNewId(tabName));
+                newTabModelNode.setIdWithRefactoring(newTabModelNode.view()->generateNewId(tabName));
                 tabViewModelNode.defaultNodeAbstractProperty().reparentHere(newTabModelNode);
             }
         }

src/plugins/qmldesigner/components/integration/designdocument.cpp

@@ -405,7 +405,7 @@ void DesignDocument::copySelected()
             node.destroy();
         }
         view.changeRootNodeType("QtQuick.Rectangle", 1, 0);
-        view.rootModelNode().setId("designer__Selection");
+        view.rootModelNode().setIdWithRefactoring("designer__Selection");
 
         foreach (const ModelNode &selectedNode, selectedNodes) {
             ModelNode newNode(view.insertModel(selectedNode));

src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp

@@ -365,7 +365,7 @@ void NavigatorTreeModel::handleChangedItem(QStandardItem *item)
          if (node.isValidId(item->text())  && !node.view()->modelNodeForId(item->text()).isValid()) {
              if (node.id().isEmpty() || item->text().isEmpty()) { //no id
                  try {
-                     node.setId(item->text());
+                     node.setIdWithoutRefactoring(item->text());
                  } catch (InvalidIdException &e) { //better save then sorry
                      QMessageBox::warning(Core::ICore::dialogParent(), tr("Invalid Id"), e.description());
                  }

src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp

@@ -151,7 +151,7 @@ void PropertyEditorView::changeValue(const QString &name)
         if (m_selectedNode.isValidId(newId)  && !modelNodeForId(newId).isValid() ) {
             if (m_selectedNode.id().isEmpty() || newId.isEmpty()) { //no id
                 try {
-                    m_selectedNode.setId(newId);
+                    m_selectedNode.setIdWithoutRefactoring(newId);
                 } catch (InvalidIdException &e) { //better save then sorry
                     m_locked = true;
                     value->setValue(m_selectedNode.id());

src/plugins/qmldesigner/designercore/include/modelnode.h

@@ -152,7 +152,8 @@ public:
 
     QString id() const;
     QString validId();
-    void setId(const QString &id);
+    void setIdWithRefactoring(const QString &id);
+    void setIdWithoutRefactoring(const QString &id);
     static bool isValidId(const QString &id);
 
     Model *model() const;

src/plugins/qmldesigner/designercore/model/modelmerger.cpp

@@ -74,7 +74,7 @@ static void syncBindingProperties(ModelNode &outputNode, const ModelNode &inputN
 static void syncId(ModelNode &outputNode, const ModelNode &inputNode, const QHash<QString, QString> &idRenamingHash)
 {
     if (!inputNode.id().isEmpty())
-        outputNode.setId(idRenamingHash.value(inputNode.id()));
+        outputNode.setIdWithoutRefactoring(idRenamingHash.value(inputNode.id()));
 }
 
 static void splitIdInBaseNameAndNumber(const QString &id, QString *baseId, int *number)

src/plugins/qmldesigner/designercore/model/modelnode.cpp

@@ -140,7 +140,7 @@ QString ModelNode::id() const
 QString ModelNode::validId()
 {
     if (id().isEmpty())
-        setId(view()->generateNewId(QString::fromUtf8(simplifiedTypeName())));
+        setIdWithRefactoring(view()->generateNewId(QString::fromUtf8(simplifiedTypeName())));
 
     return id();
 }
@@ -164,7 +164,18 @@ bool ModelNode::isValidId(const QString &id)
     return id.isEmpty() || (!idContainsWrongLetter(id) && !idIsQmlKeyWord(id));
 }
 
-void ModelNode::setId(const QString& id)
+void ModelNode::setIdWithRefactoring(const QString& id)
+{
+    if (model()->rewriterView()
+            && !id.isEmpty()
+            && !m_internalNode->id().isEmpty()) { // refactor the id if they are not empty
+        model()->rewriterView()->renameId(m_internalNode->id(), id);
+    } else {
+        setIdWithoutRefactoring(id);
+    }
+}
+
+void ModelNode::setIdWithoutRefactoring(const QString &id)
 {
     Internal::WriteLocker locker(m_model.data());
     if (!isValid()) {

src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp

@@ -500,7 +500,7 @@ QmlItemNode QmlObjectNode::instanceParentItem() const
 
 void QmlObjectNode::setId(const QString &id)
 {
-    modelNode().setId(id);
+    modelNode().setIdWithRefactoring(id);
 }
 
 QString QmlObjectNode::id() const

src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

@@ -1243,14 +1243,14 @@ void TextToModelMerger::syncNodeId(ModelNode &modelNode, const QString &astObjec
         if (!modelNode.id().isEmpty()) {
             ModelNode existingNodeWithId = m_rewriterView->modelNodeForId(astObjectId);
             if (existingNodeWithId.isValid())
-                existingNodeWithId.setId(QString());
+                existingNodeWithId.setIdWithoutRefactoring(QString());
             differenceHandler.idsDiffer(modelNode, astObjectId);
         }
     } else {
         if (modelNode.id() != astObjectId) {
             ModelNode existingNodeWithId = m_rewriterView->modelNodeForId(astObjectId);
             if (existingNodeWithId.isValid())
-                existingNodeWithId.setId(QString());
+                existingNodeWithId.setIdWithoutRefactoring(QString());
             differenceHandler.idsDiffer(modelNode, astObjectId);
         }
     }
@@ -1809,7 +1809,7 @@ void ModelAmender::propertyAbsentFromQml(AbstractProperty &modelProperty)
 
 void ModelAmender::idsDiffer(ModelNode &modelNode, const QString &qmlId)
 {
-    modelNode.setId(qmlId);
+    modelNode.setIdWithoutRefactoring(qmlId);
 }
 
 void TextToModelMerger::setupComponent(const ModelNode &node)