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

KeywordCompletion: Do not forget half the completions

Browse Source 
Broken with my recent commit to this file. Sorry.

Change-Id: I2fef1c01e33c9ea5ddf3fb3bd92401e3dc360c83
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-23 14:50:57 +02:00
parent abcdadd40e
commit ed5adb286a
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
View File

@@ -186,8 +186,8 @@ IAssistProposal *KeywordsCompletionAssistProcessor::perform(const AssistInterfac
return new FunctionHintProposal(m_startPosition, model); return new FunctionHintProposal(m_startPosition, model);
} else { } else {
QList<AssistProposalItemInterface *> items = m_snippetCollector.collect(); QList<AssistProposalItemInterface *> items = m_snippetCollector.collect();
addWordsToProposalList(&items, m_keywords.variables(), m_variableIcon); items.append(generateProposalList(m_keywords.variables(), m_variableIcon));
addWordsToProposalList(&items, m_keywords.functions(), m_functionIcon); items.append(generateProposalList(m_keywords.variables(), m_variableIcon));
return new GenericProposal(m_startPosition, items); return new GenericProposal(m_startPosition, items);
} }
} }
@@ -252,13 +252,10 @@ bool KeywordsCompletionAssistProcessor::isInComment() const
return lineBeginning.contains(startOfCommentChar()); return lineBeginning.contains(startOfCommentChar());
} }
void KeywordsCompletionAssistProcessor::addWordsToProposalList(QList<AssistProposalItemInterface *> *items, QList<AssistProposalItemInterface *>
const QStringList &words, const QIcon &icon) KeywordsCompletionAssistProcessor::generateProposalList(const QStringList &words, const QIcon &icon)
{ {
if (!items) return Utils::transform(words, [this, &icon](const QString &word) -> AssistProposalItemInterface * {
return;
*items = Utils::transform(words, [this, &icon](const QString &word) -> AssistProposalItemInterface * {
AssistProposalItem *item = new KeywordsAssistProposalItem(m_keywords.isFunction(word)); AssistProposalItem *item = new KeywordsAssistProposalItem(m_keywords.isFunction(word));
item->setText(word); item->setText(word);
item->setIcon(icon); item->setIcon(icon);

3
src/plugins/texteditor/codeassist/keywordscompletionassist.h
View File

@@ -97,8 +97,7 @@ private:
bool acceptsIdleEditor(); bool acceptsIdleEditor();
int findStartOfName(int pos = -1); int findStartOfName(int pos = -1);
bool isInComment() const; bool isInComment() const;
void addWordsToProposalList(QList<AssistProposalItemInterface *> *items, QList<AssistProposalItemInterface *> generateProposalList(const QStringList &words, const QIcon &icon);
const QStringList &words, const QIcon &icon);
int m_startPosition = -1; int m_startPosition = -1;
TextEditor::SnippetAssistCollector m_snippetCollector; TextEditor::SnippetAssistCollector m_snippetCollector;