Fixed ObjectLengthCalculator to handle incorrect QML.

Task-number: QTCREATORBUG-961

src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp

@@ -35,23 +35,28 @@ using namespace QmlJS;
 using namespace QmlDesigner;
 using namespace QmlJS::AST;
 
-ObjectLengthCalculator::ObjectLengthCalculator(const QString &text):
+ObjectLengthCalculator::ObjectLengthCalculator():
         m_doc(Document::create("<internal>"))
 {
-    m_doc->setSource(text);
-    bool ok = m_doc->parseQml();
-
-    Q_ASSERT(ok);
 }
 
-quint32 ObjectLengthCalculator::operator()(quint32 offset)
+bool ObjectLengthCalculator::operator()(const QString &text, quint32 offset,
+                                        quint32 &length)
 {
     m_offset = offset;
     m_length = 0;
+    m_doc->setSource(text);
+
+    if (!m_doc->parseQml())
+        return false;
 
     Node::accept(m_doc->qmlProgram(), this);
-
+    if (m_length) {
-    return m_length;
+        length = m_length;
+        return true;
+    } else {
+        return false;
+    }
 }
 
 bool ObjectLengthCalculator::visit(QmlJS::AST::UiObjectBinding *ast)

src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.h

@@ -38,9 +38,9 @@ namespace QmlDesigner {
 class ObjectLengthCalculator: protected QmlJS::AST::Visitor
 {
 public:
-    ObjectLengthCalculator(const QString &text);
+    ObjectLengthCalculator();
 
-    quint32 operator()(quint32 offset);
+    bool operator()(const QString &text, quint32 offset, quint32 &length);
 
 protected:
     using QmlJS::AST::Visitor::visit;

src/plugins/qmldesigner/core/model/rewriterview.cpp

@@ -477,10 +477,18 @@ int RewriterView::nodeOffset(const ModelNode &node) const
     return m_positionStorage->nodeOffset(node);
 }
 
+/**
+ * \return the length of the node's text, or -1 if it wasn't found or if an error
+ *         occurred.
+ */
 int RewriterView::nodeLength(const ModelNode &node) const
 {
-    ObjectLengthCalculator objectLengthCalculator(m_textModifier->text());
+    ObjectLengthCalculator objectLengthCalculator;
-    return objectLengthCalculator(nodeOffset(node));
+    unsigned length;
+    if (objectLengthCalculator(m_textModifier->text(), nodeOffset(node), length))
+        return (int) length;
+    else
+        return -1;
 }
 
 int RewriterView::firstDefinitionInsideOffset(const ModelNode &node) const
@@ -492,9 +500,14 @@ int RewriterView::firstDefinitionInsideOffset(const ModelNode &node) const
 int RewriterView::firstDefinitionInsideLength(const ModelNode &node) const
 {
     FirstDefinitionFinder firstDefinitionFinder(m_textModifier->text());
-    int offset =  firstDefinitionFinder(nodeOffset(node));
+    const int offset =  firstDefinitionFinder(nodeOffset(node));
-    ObjectLengthCalculator objectLengthCalculator(m_textModifier->text());
+
-    return objectLengthCalculator(offset);
+    ObjectLengthCalculator objectLengthCalculator;
+    unsigned length;
+    if (objectLengthCalculator(m_textModifier->text(), offset, length))
+        return length;
+    else
+        return -1;
 }
 
 bool RewriterView::modificationGroupActive()

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

@@ -952,10 +952,13 @@ void TextToModelMerger::setupComponent(const ModelNode &node)
     if (componentText.contains("Component")) { //explicit component
         FirstDefinitionFinder firstDefinitionFinder(componentText);
         int offset = firstDefinitionFinder(0);
-        ObjectLengthCalculator objectLengthCalculator(componentText);
+        ObjectLengthCalculator objectLengthCalculator;
-        int length = objectLengthCalculator(offset);
+        unsigned length;
-        for (int i = offset;i<offset + length;i++)
+        if (objectLengthCalculator(componentText, offset, length)) {
-            result.append(componentText.at(i));
+            result = componentText.mid(offset, length);
+        } else {
+            result = componentText;
+        }
     } else {
         result = componentText; //implicit component
     }