feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Set correct scope in signal handlers.

Browse Source 
This means the code model will now offer correct completion and
highlighting for arguments of signals in their handlers, example:

MouseArea {
  onClicked: {
    mou<complete> // now also completes 'mouse'
  }
}

Reviewed-by: Fawzi Mohamed
Change-Id: I01838ef00e391b13e6e5a832c9ec3cd983689c5b
Reviewed-on: http://codereview.qt-project.org/6147
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Christian Kamm
2011-10-05 14:14:35 +02:00
parent 03689eeb50
commit 010ce2d20d
7 changed files with 108 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -424,7 +424,7 @@ public:
virtual ~QmlObjectValue();
virtual void processMembers(MemberProcessor *processor) const;
const Value *propertyValue(const LanguageUtils::FakeMetaProperty &prop) const;
const Value *valueForCppName(const QString &typeName) const;
using ObjectValue::prototype;
const QmlObjectValue *prototype() const;
@@ -448,6 +448,8 @@ public:
LanguageUtils::FakeMetaEnum getEnum(const QString &typeName, const QmlObjectValue **foundInScope = 0) const;
const QmlEnumValue *getEnumValue(const QString &typeName, const QmlObjectValue **foundInScope = 0) const;
const ObjectValue *signalScope(const QString &signalName) const;
protected:
bool isDerivedFrom(LanguageUtils::FakeMetaObject::ConstPtr base) const;
@@ -461,6 +463,7 @@ private:
const LanguageUtils::ComponentVersion _componentVersion;
const LanguageUtils::ComponentVersion _importVersion;
mutable QAtomicPointer< QList<const Value *> > _metaSignatures;
mutable QAtomicPointer< QHash<QString, const ObjectValue *> > _signalScopes;
QHash<QString, const QmlEnumValue * > _enums;
int _metaObjectRevision;
};
@@ -766,6 +769,7 @@ class QMLJS_EXPORT ASTSignal: public FunctionValue
AST::UiPublicMember *_ast;
const Document *_doc;
QString _slotName;
const ObjectValue *_bodyScope;
public:
ASTSignal(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
@@ -773,6 +777,7 @@ public:
AST::UiPublicMember *ast() const { return _ast; }
QString slotName() const { return _slotName; }
const ObjectValue *bodyScope() const { return _bodyScope; }
// FunctionValue interface
virtual int argumentCount() const;