Added range information for lists which contains the position and length

from the open bracket upto the close bracket.

4 files changed, 33 insertions, 0 deletions

diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 38436b4..0ebbbfb 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -1415,6 +1415,30 @@ void QmlDomList::setValues(const QList<QmlDomValue> &values)
     qWarning("QmlDomList::setValues(const QList<QmlDomValue> &): Not implemented");
 }
 
+/*!
+    Returns the position in the input data where the list started, or 0 if
+ the property is invalid.
+*/
+int QmlDomList::position() const
+{
+    if (d && d->property) {
+        return d->property->listValueRange.offset;
+    } else
+        return 0;
+}
+
+/*!
+    Returns the length in the input data from where the list started upto
+ the end of it, or 0 if the property is invalid.
+*/
+int QmlDomList::length() const
+{
+    if (d && d->property)
+        return d->property->listValueRange.length;
+    else
+        return 0;
+}
+
 
 /*!
     \class QmlDomComponent
diff --git a/src/declarative/qml/qmldom.h b/src/declarative/qml/qmldom.h
index 04ce8b9..86eaecb 100644
--- a/src/declarative/qml/qmldom.h
+++ b/src/declarative/qml/qmldom.h
@@ -262,6 +262,9 @@ public:
     QList<QmlDomValue> values() const;
     void setValues(const QList<QmlDomValue> &);
 
+    int position() const;
+    int length() const;
+
 private:
     friend class QmlDomValue;
     QSharedDataPointer<QmlDomValuePrivate> d;
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index 020cae5..0fdd26b 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -276,6 +276,7 @@ namespace QmlParser
         bool isDefault;
 
         LocationSpan location;
+        LocationRange listValueRange;
 
         void dump(int = 0) const;
     };
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 75c81a7..31a20be 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -651,6 +651,11 @@ bool ProcessAST::visit(AST::UiArrayBinding *node)
 
     accept(node->members);
 
+    // For the DOM, store the position of the T_LBRACKET upto the T_RBRACKET as the range:
+    Property* prop = currentProperty();
+    prop->listValueRange.offset = node->lbracketToken.offset;
+    prop->listValueRange.length = node->rbracketToken.offset + node->rbracketToken.length - node->lbracketToken.offset;
+
     while (propertyCount--)
         _stateStack.pop();