QmlJS: Completion for attached properties.

3 files changed, 17 insertions, 6 deletions

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 39c3d9c33b..f967c97da0 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -308,7 +308,7 @@ public:
         bool isAttachedProperty = false;
         if (! propertyName.isEmpty() && propertyName[0].isUpper()) {
             isAttachedProperty = true;
-            if (const Interpreter::ObjectValue *qmlTypes = m_context->scopeChain().qmlTypes)
+            if (const Interpreter::ObjectValue *qmlTypes = m_context->scopeChain().qmlAttachedTypes)
                 scopeObjects += qmlTypes;
         }
 
diff --git a/src/plugins/qmljseditor/qmljscodecompletion.cpp b/src/plugins/qmljseditor/qmljscodecompletion.cpp
index 88a7c81206..051debcb69 100644
--- a/src/plugins/qmljseditor/qmljscodecompletion.cpp
+++ b/src/plugins/qmljseditor/qmljscodecompletion.cpp
@@ -841,10 +841,12 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
         bool doGlobalCompletion = true;
         bool doQmlKeywordCompletion = true;
         bool doJsKeywordCompletion = true;
+        bool doQmlTypeCompletion = false;
 
         if (contextFinder.isInLhsOfBinding() && qmlScopeType) {
             doGlobalCompletion = false;
             doJsKeywordCompletion = false;
+            doQmlTypeCompletion = true;
 
             EnumerateProperties enumerateProperties(context);
             enumerateProperties.setGlobalCompletion(true);
@@ -858,8 +860,6 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
             m_completions.append(idPropertyCompletion);
 
             addCompletionsPropertyLhs(enumerateProperties(qmlScopeType), symbolIcon, PropertyOrder, contextFinder.isAfterOnInLhsOfBinding());
-            if (const Interpreter::ObjectValue *qmlTypes = context->scopeChain().qmlTypes)
-                addCompletions(enumerateProperties(qmlTypes), symbolIcon, TypeOrder);
 
             if (ScopeBuilder::isPropertyChangesObject(context, qmlScopeType)
                     && context->scopeChain().qmlScopeObjects.size() == 2) {
@@ -884,6 +884,16 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
             }
         }
 
+        if (!contextFinder.isInImport() && !contextFinder.isInQmlContext())
+            doQmlTypeCompletion = true;
+
+        if (doQmlTypeCompletion) {
+            if (const Interpreter::ObjectValue *qmlTypes = context->scopeChain().qmlTypes) {
+                EnumerateProperties enumerateProperties(context);
+                addCompletions(enumerateProperties(qmlTypes), symbolIcon, TypeOrder);
+            }
+        }
+
         if (doGlobalCompletion) {
             // It's a global completion.
             EnumerateProperties enumerateProperties(context);
@@ -934,9 +944,10 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
 
             if (value && completionOperator == QLatin1Char('.')) { // member completion
                 EnumerateProperties enumerateProperties(context);
-                if (contextFinder.isInLhsOfBinding() && qmlScopeType && expressionUnderCursor.text().at(0).isLower())
+                if (contextFinder.isInLhsOfBinding() && qmlScopeType) {
+                    enumerateProperties.setEnumerateGeneratedSlots(true);
                     addCompletionsPropertyLhs(enumerateProperties(value), symbolIcon, PropertyOrder, contextFinder.isAfterOnInLhsOfBinding());
-                else
+                } else
                     addCompletions(enumerateProperties(value), symbolIcon, SymbolOrder);
             } else if (value && completionOperator == QLatin1Char('(') && m_startPosition == editor->position()) {
                 // function completion
diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp
index a92bcbacdb..779e3222d1 100644
--- a/src/plugins/qmljseditor/qmljsfindreferences.cpp
+++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp
@@ -178,7 +178,7 @@ protected:
         const ScopeChain &chain = _context->scopeChain();
         if (chain.jsScopes.contains(scope)
                 || chain.qmlScopeObjects.contains(scope)
-                || chain.qmlTypes == scope
+                || chain.qmlAttachedTypes == scope
                 || chain.globalScope == scope)
             return false;