QmlJS: Add quick fix to wrap element in Loader.

Change-Id: Ie8b1624abfd9faa8c6153ad99e48964d597d543c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

1 files changed, 18 insertions, 7 deletions

diff --git a/src/libs/qmljs/qmljsutils.cpp b/src/libs/qmljs/qmljsutils.cpp
index fe5bd1967da..956196e5f3d 100644
--- a/src/libs/qmljs/qmljsutils.cpp
+++ b/src/libs/qmljs/qmljsutils.cpp
@@ -96,20 +96,29 @@ SourceLocation QmlJS::fullLocationForQualifiedId(AST::UiQualifiedId *qualifiedId
     return locationFromRange(start, end);
 }
 
-QString QmlJS::idOfObject(UiObjectDefinition *object)
+QString QmlJS::idOfObject(UiObjectDefinition *object, UiScriptBinding **idBinding)
 {
-    if (!object)
+    if (!object) {
+        if (idBinding)
+            *idBinding = 0;
         return QString();
-    return idOfObject(object->initializer);
+    }
+    return idOfObject(object->initializer, idBinding);
 }
-QString QmlJS::idOfObject(UiObjectBinding *object)
+QString QmlJS::idOfObject(UiObjectBinding *object, UiScriptBinding **idBinding)
 {
-    if (!object)
+    if (!object) {
+        if (idBinding)
+            *idBinding = 0;
         return QString();
-    return idOfObject(object->initializer);
+    }
+    return idOfObject(object->initializer, idBinding);
 }
-QString QmlJS::idOfObject(UiObjectInitializer *initializer)
+QString QmlJS::idOfObject(UiObjectInitializer *initializer, UiScriptBinding **idBinding)
 {
+    if (idBinding)
+        *idBinding = 0;
+
     if (!initializer)
         return QString();
 
@@ -123,6 +132,8 @@ QString QmlJS::idOfObject(UiObjectInitializer *initializer)
                 continue;
             if (ExpressionStatement *expstmt = cast<ExpressionStatement *>(script->statement)) {
                 if (IdentifierExpression *idexp = cast<IdentifierExpression *>(expstmt->expression)) {
+                    if (idBinding)
+                        *idBinding = script;
                     return idexp->name.toString();
                 }
             }