diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index 9f5819480ed..0eacbcbe706 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -974,6 +974,19 @@ struct QmlJSLessThan // ------------------------- // QmlJSAssistProposalModel // ------------------------- +void QmlJSAssistProposalModel::filter(const QString &prefix) +{ + BasicProposalItemListModel::filter(prefix); + if (prefix.startsWith(QLatin1String("__"))) + return; + QList newCurrentItems; + newCurrentItems.reserve(m_currentItems.size()); + foreach (BasicProposalItem *item, m_currentItems) + if (!item->text().startsWith(QLatin1String("__"))) + newCurrentItems << item; + m_currentItems = newCurrentItems; +} + void QmlJSAssistProposalModel::sort() { qSort(currentItems().first, currentItems().second, QmlJSLessThan()); diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h index 70d0ce5fa1a..dced072d9e3 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.h +++ b/src/plugins/qmljseditor/qmljscompletionassist.h @@ -69,6 +69,7 @@ public: : TextEditor::BasicProposalItemListModel(items) {} + virtual void filter(const QString &prefix); virtual void sort(); virtual bool keepPerfectMatch(TextEditor::AssistReason reason) const; }; diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp index 330c95bc57d..b6c479b9c89 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp +++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp @@ -121,8 +121,8 @@ BasicProposalItemListModel::BasicProposalItemListModel() {} BasicProposalItemListModel::BasicProposalItemListModel(const QList &items) - : m_originalItems(items) - , m_currentItems(items) + : m_currentItems(items) + , m_originalItems(items) { mapPersistentIds(); } diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h index e882e5279d2..533f2859c05 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h +++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h @@ -69,13 +69,13 @@ public: protected: typedef QList::iterator ItemIterator; QPair currentItems(); + QList m_currentItems; private: void mapPersistentIds(); QHash m_idByText; QList m_originalItems; - QList m_currentItems; }; } // TextEditor