From 1d4cd9b7f28b867aee3815fabdbd9c0fe39a0bdb Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Mon, 21 Feb 2011 14:56:16 +0100
Subject: [PATCH] QmlJS: Remove the strict separation of types and attached
types.
The problem was that several lookup calls suddenly failed because
the actual QML types were no longer in the default scope chain. However,
the QML documentation says the type names are in the scope.
Also, 'MyComponent.' in a JS-expression context only showed the attached
properties of MyComponent and missed the enums.
With this change completion now may offers too many options, but that's
better than missing some.
This reverts parts of 490f2797f636ff49ce0a778610a2532d1277e4d4
Reviewed-by: Leandro Melo
---
src/libs/qmljs/qmljscheck.cpp | 2 +-
src/libs/qmljs/qmljsinterpreter.cpp | 71 ++-----------------
src/libs/qmljs/qmljsinterpreter.h | 14 ----
src/libs/qmljs/qmljsscopebuilder.cpp | 1 -
.../designercore/model/texttomodelmerger.cpp | 2 +-
.../qmljseditor/qmljsfindreferences.cpp | 2 +-
6 files changed, 8 insertions(+), 84 deletions(-)
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index ce0d97f5cbe..8c3d0d1554d 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -826,7 +826,7 @@ const Value *Check::checkScopeObjectMember(const UiQualifiedId *id)
bool isAttachedProperty = false;
if (! propertyName.isEmpty() && propertyName[0].isUpper()) {
isAttachedProperty = true;
- if (const ObjectValue *qmlTypes = _context.scopeChain().qmlAttachedTypes)
+ if (const ObjectValue *qmlTypes = _context.scopeChain().qmlTypes)
scopeObjects += qmlTypes;
}
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index 90416d3a6df..f8fd9f26a20 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -651,6 +651,9 @@ void QmlObjectValue::processMembers(MemberProcessor *processor) const
}
}
+ if (_attachedType)
+ _attachedType->processMembers(processor);
+
ObjectValue::processMembers(processor);
}
@@ -1305,7 +1308,6 @@ void StringValue::accept(ValueVisitor *visitor) const
ScopeChain::ScopeChain()
: globalScope(0)
, qmlTypes(0)
- , qmlAttachedTypes(0)
{
}
@@ -1365,8 +1367,8 @@ void ScopeChain::update()
_all += qmlScopeObjects;
if (ids)
_all += ids;
- if (qmlAttachedTypes)
- _all += qmlAttachedTypes;
+ if (qmlTypes)
+ _all += qmlTypes;
// qmlTypes are not added on purpose
_all += jsScopes;
}
@@ -3425,66 +3427,3 @@ ImportInfo TypeEnvironment::importInfo(const QString &name, const Context *conte
}
return ImportInfo();
}
-
-namespace {
-class AttachedTypeProcessor: public MemberProcessor
-{
- MemberProcessor *_wrapped;
-
-public:
- AttachedTypeProcessor(MemberProcessor *wrapped) : _wrapped(wrapped) {}
-
- static const QmlObjectValue *attachedType(const Value *v)
- {
- if (const QmlObjectValue *qmlValue = dynamic_cast<const QmlObjectValue *>(v)) {
- return qmlValue->attachedType();
- }
- return 0;
- }
-
- virtual bool processProperty(const QString &name, const Value *value)
- {
- const QmlObjectValue *qmlValue = attachedType(value);
- return qmlValue ? _wrapped->processProperty(name, qmlValue) : true;
- }
- virtual bool processEnumerator(const QString &name, const Value *value)
- {
- const QmlObjectValue *qmlValue = attachedType(value);
- return qmlValue ? _wrapped->processEnumerator(name, qmlValue) : true;
- }
- virtual bool processSignal(const QString &name, const Value *value)
- {
- const QmlObjectValue *qmlValue = attachedType(value);
- return qmlValue ? _wrapped->processSignal(name, qmlValue) : true;
- }
- virtual bool processSlot(const QString &name, const Value *value)
- {
- const QmlObjectValue *qmlValue = attachedType(value);
- return qmlValue ? _wrapped->processSlot(name, qmlValue) : true;
- }
- virtual bool processGeneratedSlot(const QString &name, const Value *value)
- {
- const QmlObjectValue *qmlValue = attachedType(value);
- return qmlValue ? _wrapped->processGeneratedSlot(name, qmlValue) : true;
- }
-};
-} // anonymous namespace
-
-AttachedTypeEnvironment::AttachedTypeEnvironment(const TypeEnvironment *typeEnv)
- : ObjectValue(typeEnv->engine())
- , _typeEnvironment(typeEnv)
-{
-}
-
-const Value *AttachedTypeEnvironment::lookupMember(const QString &name, const Context *context,
- const ObjectValue **, bool) const
-{
- const Value *v = _typeEnvironment->lookupMember(name, context);
- return AttachedTypeProcessor::attachedType(v);
-}
-
-void AttachedTypeEnvironment::processMembers(MemberProcessor *processor) const
-{
- AttachedTypeProcessor wrappedProcessor(processor);
- _typeEnvironment->processMembers(&wrappedProcessor);
-}
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index c03c97a10aa..eba83283f00 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -305,7 +305,6 @@ public:
QSharedPointer<const QmlComponentChain> qmlComponentScope;
QList<const ObjectValue *> qmlScopeObjects;
const TypeEnvironment *qmlTypes;
- const AttachedTypeEnvironment *qmlAttachedTypes;
QList<const ObjectValue *> jsScopes;
// rebuilds the flat list of all scopes
@@ -1038,19 +1037,6 @@ public:
ImportInfo importInfo(const QString &name, const Context *context) const;
};
-class QMLJS_EXPORT AttachedTypeEnvironment: public ObjectValue
-{
- const TypeEnvironment *_typeEnvironment;
-
-public:
- AttachedTypeEnvironment(const TypeEnvironment *typeEnv);
-
- virtual const Value *lookupMember(const QString &name, const Context *context,
- const ObjectValue **foundInObject = 0,
- bool examinePrototypes = true) const;
- virtual void processMembers(MemberProcessor *processor) const;
-};
-
} } // namespace QmlJS::Interpreter
#endif // QMLJS_INTERPRETER_H
diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp
index fc5e2a9bd61..d3b6849f318 100644
--- a/src/libs/qmljs/qmljsscopebuilder.cpp
+++ b/src/libs/qmljs/qmljsscopebuilder.cpp
@@ -131,7 +131,6 @@ void ScopeBuilder::initializeScopeChain()
if (const TypeEnvironment *typeEnvironment = _context->typeEnvironment(_doc.data())) {
scopeChain.qmlTypes = typeEnvironment;
- scopeChain.qmlAttachedTypes = new AttachedTypeEnvironment(typeEnvironment);
}
} else {
// add scope chains for all components that import this file
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index f967c97da01..39c3d9c33bb 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().qmlAttachedTypes)
+ if (const Interpreter::ObjectValue *qmlTypes = m_context->scopeChain().qmlTypes)
scopeObjects += qmlTypes;
}
diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp
index 779e3222d1e..a92bcbacdb6 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.qmlAttachedTypes == scope
+ || chain.qmlTypes == scope
|| chain.globalScope == scope)
return false;
--
GitLab