From ed5adb286a80de3e7d70332aa581b8880a72b4ab Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 23 Aug 2016 14:50:57 +0200 Subject: [PATCH] KeywordCompletion: Do not forget half the completions Broken with my recent commit to this file. Sorry. Change-Id: I2fef1c01e33c9ea5ddf3fb3bd92401e3dc360c83 Reviewed-by: David Schulz --- .../codeassist/keywordscompletionassist.cpp | 13 +++++-------- .../codeassist/keywordscompletionassist.h | 3 +-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp index b4b98e98eef..be9ffd91599 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp @@ -186,8 +186,8 @@ IAssistProposal *KeywordsCompletionAssistProcessor::perform(const AssistInterfac return new FunctionHintProposal(m_startPosition, model); } else { QList items = m_snippetCollector.collect(); - addWordsToProposalList(&items, m_keywords.variables(), m_variableIcon); - addWordsToProposalList(&items, m_keywords.functions(), m_functionIcon); + items.append(generateProposalList(m_keywords.variables(), m_variableIcon)); + items.append(generateProposalList(m_keywords.variables(), m_variableIcon)); return new GenericProposal(m_startPosition, items); } } @@ -252,13 +252,10 @@ bool KeywordsCompletionAssistProcessor::isInComment() const return lineBeginning.contains(startOfCommentChar()); } -void KeywordsCompletionAssistProcessor::addWordsToProposalList(QList *items, - const QStringList &words, const QIcon &icon) +QList +KeywordsCompletionAssistProcessor::generateProposalList(const QStringList &words, const QIcon &icon) { - if (!items) - return; - - *items = Utils::transform(words, [this, &icon](const QString &word) -> AssistProposalItemInterface * { + return Utils::transform(words, [this, &icon](const QString &word) -> AssistProposalItemInterface * { AssistProposalItem *item = new KeywordsAssistProposalItem(m_keywords.isFunction(word)); item->setText(word); item->setIcon(icon); diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.h b/src/plugins/texteditor/codeassist/keywordscompletionassist.h index a380d18bd80..b580da9e85a 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.h +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.h @@ -97,8 +97,7 @@ private: bool acceptsIdleEditor(); int findStartOfName(int pos = -1); bool isInComment() const; - void addWordsToProposalList(QList *items, - const QStringList &words, const QIcon &icon); + QList generateProposalList(const QStringList &words, const QIcon &icon); int m_startPosition = -1; TextEditor::SnippetAssistCollector m_snippetCollector;