diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index a83f24141d9215efb70a524ce6e36ac0bd326041..c7f9b5cba5028ff218db162e40b27e8fb59eeb5d 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -1385,7 +1385,6 @@ QList<const ObjectValue *> ScopeChain::all() const Context::Context(Engine *engine) : _engine(engine), - _lookupMode(JSLookup), _qmlScopeObjectIndex(-1), _qmlScopeObjectSet(false) { @@ -1410,16 +1409,6 @@ ScopeChain &Context::scopeChain() return _scopeChain; } -Context::LookupMode Context::lookupMode() const -{ - return _lookupMode; -} - -void Context::setLookupMode(LookupMode lookupMode) -{ - _lookupMode = lookupMode; -} - const ObjectValue *Context::typeEnvironment(const QmlJS::Document *doc) const { return _typeEnvironments.value(doc->fileName(), 0); @@ -1437,9 +1426,7 @@ const Value *Context::lookup(const QString &name) const ObjectValue *scope = scopes.at(index); if (const Value *member = scope->lookupMember(name, this)) { - if (_lookupMode == JSLookup || ! dynamic_cast<const ASTVariableReference *>(member)) { - return member; - } + return member; } } diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index 7ce3fcffba62c6decb2bd46fd73e0ad4bae6ee37..b1aed525380716ed9ebf99547ec1c9287427008e 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -270,12 +270,6 @@ private: class QMLJS_EXPORT Context { -public: - enum LookupMode { - JSLookup, - QmlLookup - }; - public: Context(Engine *engine); ~Context(); @@ -284,9 +278,6 @@ public: const ScopeChain &scopeChain() const; ScopeChain &scopeChain(); - LookupMode lookupMode() const; - void setLookupMode(LookupMode lookupMode); - const ObjectValue *typeEnvironment(const Document *doc) const; void setTypeEnvironment(const Document *doc, const ObjectValue *typeEnvironment); @@ -307,7 +298,6 @@ private: typedef QHash<QString, const Value *> Properties; Engine *_engine; - LookupMode _lookupMode; QHash<const ObjectValue *, Properties> _properties; QHash<QString, const ObjectValue *> _typeEnvironments; QSet<QString> _documentsImportingPlugins; diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index e562cc498d428360716582c946fd2971783c8ff7..d9325b9d1fd6a46e456942eeb67cc974e82deb45 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -54,8 +54,6 @@ void Link::initializeScopeChain() QHash<Document *, ScopeChain::QmlComponentChain *> componentScopes; if (_doc->qmlProgram()) { - _context->setLookupMode(Context::QmlLookup); - scopeChain.qmlComponentScope.clear(); componentScopes.insert(_doc.data(), &scopeChain.qmlComponentScope); makeComponentChain(_doc, &scopeChain.qmlComponentScope, &componentScopes); diff --git a/src/plugins/qmljseditor/qmljscodecompletion.cpp b/src/plugins/qmljseditor/qmljscodecompletion.cpp index e30f3554f8b9bab2f083e401c736f6164c902925..c26c8ccc6123e119c80a7604226ed76295704a02 100644 --- a/src/plugins/qmljseditor/qmljscodecompletion.cpp +++ b/src/plugins/qmljseditor/qmljscodecompletion.cpp @@ -208,9 +208,7 @@ public: private: void insertProperty(const QString &name, const Interpreter::Value *value) { - if (_context->lookupMode() == Interpreter::Context::JSLookup || - ! dynamic_cast<const Interpreter::ASTVariableReference *>(value)) - _properties.insert(name, value); + _properties.insert(name, value); } virtual bool processProperty(const QString &name, const Interpreter::Value *value)