QmlDesigner.copyNPase: fix for components

Since the buffer for copy and paste has no proper
representation in the project managment QmlJs::Check cannot
handle components. For now we just turn of Check for this case, since
we check the final document anyway.

Reviewed-by: Kai Koehne

diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index eaed395..493bb9e 100644 (file)
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
@@ -507,7 +507,7 @@ void DesignDocumentController::deleteSelected()
 
 void DesignDocumentController::copySelected()
 {
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
+    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 0));
     model->setMetaInfo(m_d->model->metaInfo());
     model->setFileUrl(m_d->model->fileUrl());
     model->changeImports(m_d->model->imports(), QList<Import>());
@@ -552,7 +552,7 @@ void DesignDocumentController::copySelected()
         foreach (ModelNode node, view.rootModelNode().allDirectSubModelNodes()) {
             node.destroy();
         }
-        view.changeRootNodeType("Qt/Rectangle", 4, 7);
+        view.changeRootNodeType("QtQuick.Rectangle", 1, 0);
         view.rootModelNode().setId("designer__Selection");
 
         foreach (const ModelNode &selectedNode, selectedNodes) {

diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
index 097604c..82154c8 100644 (file)
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
@@ -158,10 +158,20 @@ QString DesignDocumentControllerView::toText() const
     QScopedPointer<Model> outputModel(Model::create("QtQuick.Rectangle", 1, 0));
     outputModel->setMetaInfo(model()->metaInfo());
     QPlainTextEdit textEdit;
-    textEdit.setPlainText("import Qt 4.7; Item {}");
+
+    QString imports;
+    foreach (const Import &import, model()->imports()) {
+        if (import.isFileImport())
+            imports += QLatin1String("import ") + QLatin1String("\"") + import.file() + QLatin1String("\"")+ QLatin1String(";\n");
+        else
+            imports += QLatin1String("import ") + import.url() + QLatin1String(" ") + import.version() + QLatin1String(";\n");
+    }
+
+    textEdit.setPlainText(imports +  QLatin1String("Item {\n}\n"));
     NotIndentingTextEditModifier modifier(&textEdit);
 
     QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, 0));
+    rewriterView->setCheckSemanticErrors(false);
     rewriterView->setTextModifier(&modifier);
     outputModel->attachView(rewriterView.data());
 
@@ -189,6 +199,7 @@ void DesignDocumentControllerView::fromText(QString text)
     NotIndentingTextEditModifier modifier(&textEdit);
 
     QScopedPointer<RewriterView> rewriterView(new RewriterView(RewriterView::Amend, 0));
+    rewriterView->setCheckSemanticErrors(false);
     rewriterView->setTextModifier(&modifier);
     inputModel->attachView(rewriterView.data());
 

diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index 3a03ca4..0196947 100644 (file)
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -187,6 +187,12 @@ public:
     QmlJS::LookupContext *lookupContext() const;
     QmlJS::Document *document() const;
 
+    bool checkSemanticErrors() const
+    { return m_checkErrors; }
+
+    void setCheckSemanticErrors(bool b)
+    { m_checkErrors = b; }
+
 signals:
     void errorsChanged(const QList<RewriterView::Error> &errors);
 
@@ -213,6 +219,7 @@ private: //variables
     RewriterTransaction m_removeDefaultPropertyTransaction;
     QString m_rewritingErrorMessage;
     QString lastCorrectQmlSource;
+    bool m_checkErrors;
 };
 
 } //QmlDesigner

diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
index b87d831..dcabd74 100644 (file)
--- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
@@ -172,12 +172,12 @@ ModelNode ModelMerger::insertModel(const ModelNode &modelNode)
 
 void ModelMerger::replaceModel(const ModelNode &modelNode)
 {
-    try {
-        RewriterTransaction transaction(view()->beginRewriterTransaction());
-
         view()->model()->changeImports(modelNode.model()->imports(), QList<Import>());
         view()->model()->setFileUrl(modelNode.model()->fileUrl());
 
+    try {
+        RewriterTransaction transaction(view()->beginRewriterTransaction());
+
         ModelNode rootNode(view()->rootModelNode());
 
         foreach (const QString &propertyName, rootNode.propertyNames())

diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index f07a31e..3dd7010 100644 (file)
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -133,7 +133,8 @@ RewriterView::RewriterView(DifferenceHandling differenceHandling, QObject *paren
         m_modelToTextMerger(new Internal::ModelToTextMerger(this)),
         m_textToModelMerger(new Internal::TextToModelMerger(this)),
         m_textModifier(0),
-        transactionLevel(0)
+        transactionLevel(0),
+        m_checkErrors(true)
 {
 }
 

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 5044604..8f3920b 100644 (file)
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -662,16 +662,18 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
             errors.append(RewriterView::Error(diagnosticMessage, QUrl::fromLocalFile(doc->fileName())));
         }
 
-        Check check(doc, snapshot, m_lookupContext->context());
-        check.setOptions(check.options() & ~Check::ErrCheckTypeErrors);
-        foreach (const QmlJS::DiagnosticMessage &diagnosticMessage, check())
-            if (diagnosticMessage.isError())
-            errors.append(RewriterView::Error(diagnosticMessage, QUrl::fromLocalFile(doc->fileName())));
-
-        if (!errors.isEmpty()) {
-            m_rewriterView->setErrors(errors);
-            setActive(false);
-            return false;
+        if (view()->checkSemanticErrors()) {
+            Check check(doc, snapshot, m_lookupContext->context());
+            check.setOptions(check.options() & ~Check::ErrCheckTypeErrors);
+            foreach (const QmlJS::DiagnosticMessage &diagnosticMessage, check())
+                if (diagnosticMessage.isError())
+                    errors.append(RewriterView::Error(diagnosticMessage, QUrl::fromLocalFile(doc->fileName())));
+
+            if (!errors.isEmpty()) {
+                m_rewriterView->setErrors(errors);
+                setActive(false);
+                return false;
+            }
         }
 
         setupImports(doc, differenceHandler);