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

QmlJS: Improve completion of signals.

Browse Source 
* Change from Reference to FunctionValue: There was no reason for them
  being References as the argument types never need lookup.
* Enumerate in global completion: When you define 'signal foo(int a)'
  you now get completion for 'foo' and will get the function argument
  hint popup.

Change-Id: Ic348db477a34ba468dfdb690499a9cd8fd605cd2
Reviewed-on: http://codereview.qt-project.org/4774
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Christian Kamm
2011-09-13 14:29:47 +02:00
parent fa281be8bf
commit 5b1a24ab95
5 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -759,23 +759,26 @@ private:
virtual const Value *value(ReferenceContext *referenceContext) const;
};
class QMLJS_EXPORT ASTSignalReference: public Reference
class QMLJS_EXPORT ASTSignal: public FunctionValue
{
AST::UiPublicMember *_ast;
const Document *_doc;
QString _slotName;
public:
ASTSignalReference(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
virtual ~ASTSignalReference();
ASTSignal(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
virtual ~ASTSignal();
AST::UiPublicMember *ast() const { return _ast; }
QString slotName() const { return _slotName; }
virtual bool getSourceLocation(QString *fileName, int *line, int *column) const;
// FunctionValue interface
virtual int argumentCount() const;
virtual const Value *argument(int index) const;
virtual QString argumentName(int index) const;
private:
virtual const Value *value(ReferenceContext *referenceContext) const;
// Value interface
virtual bool getSourceLocation(QString *fileName, int *line, int *column) const;
};
class QMLJS_EXPORT ASTObjectValue: public ObjectValue
@@ -784,7 +787,7 @@ class QMLJS_EXPORT ASTObjectValue: public ObjectValue
AST::UiObjectInitializer *_initializer;
const Document *_doc;
QList<ASTPropertyReference *> _properties;
QList<ASTSignalReference *> _signals;
QList<ASTSignal *> _signals;
ASTPropertyReference *_defaultPropertyRef;
public: