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

QML: ensure that signal treated like functions/slots in completions

Browse Source 
Renames enumerateSlots -> enumerateMethods to mirror the new usage

Fixes: QTCREATORBUG-24124
Change-Id: I31ac7d5f4bf568e1ab9c9463b1ebd0011dfcb9d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Fawzi Mohamed
2020-06-18 17:12:31 +02:00
parent 848054ce3c
commit 96c1b4119e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmljseditor/qmljscompletionassist.cpp
View File

@@ -187,7 +187,7 @@ class ProcessProperties: private MemberProcessor
QSet<const ObjectValue *> _processed; QSet<const ObjectValue *> _processed;
bool _globalCompletion = false; bool _globalCompletion = false;
bool _enumerateGeneratedSlots = false; bool _enumerateGeneratedSlots = false;
bool _enumerateSlots = true; bool _enumerateMethods = true;
const ScopeChain *_scopeChain; const ScopeChain *_scopeChain;
const ObjectValue *_currentObject = nullptr; const ObjectValue *_currentObject = nullptr;
PropertyProcessor *_propertyProcessor = nullptr; PropertyProcessor *_propertyProcessor = nullptr;
@@ -208,9 +208,9 @@ public:
_enumerateGeneratedSlots = enumerate; _enumerateGeneratedSlots = enumerate;
} }
void setEnumerateSlots(bool enumerate) void setEnumerateMethods(bool enumerate)
{ {
_enumerateSlots = enumerate; _enumerateMethods = enumerate;
} }
void operator ()(const Value *value, PropertyProcessor *processor) void operator ()(const Value *value, PropertyProcessor *processor)
@@ -251,14 +251,14 @@ private:
bool processSignal(const QString &name, const Value *value) override bool processSignal(const QString &name, const Value *value) override
{ {
if (_globalCompletion) if (_globalCompletion || _enumerateMethods)
process(name, value); process(name, value);
return true; return true;
} }
bool processSlot(const QString &name, const Value *value) override bool processSlot(const QString &name, const Value *value) override
{ {
if (_enumerateSlots) if (_enumerateMethods)
process(name, value); process(name, value);
return true; return true;
} }
@@ -771,7 +771,7 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const AssistInterface *
ProcessProperties processProperties(&scopeChain); ProcessProperties processProperties(&scopeChain);
processProperties.setGlobalCompletion(true); processProperties.setGlobalCompletion(true);
processProperties.setEnumerateGeneratedSlots(true); processProperties.setEnumerateGeneratedSlots(true);
processProperties.setEnumerateSlots(false); processProperties.setEnumerateMethods(false);
// id: is special // id: is special
AssistProposalItem *idProposalItem = new QmlJSAssistProposalItem; AssistProposalItem *idProposalItem = new QmlJSAssistProposalItem;