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

Don't popup the automatic completion box when the identifier under cursor is a complete valid word.

Browse Source
This commit is contained in:
Roberto Raggi
2010-12-14 11:50:49 +01:00
parent bb55460cfc
commit 8069c1745e
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -715,6 +715,31 @@ int CppCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
{
int index = startCompletionHelper(editor);
if (index != -1) {
if (m_automaticCompletion) {
const int pos = editor->position();
const QChar ch = editor->characterAt(pos);
if (! (ch.isLetterOrNumber() || ch == QLatin1Char('_'))) {
for (int i = pos - 1;; --i) {
const QChar ch = editor->characterAt(i);
if (ch.isLetterOrNumber() || ch == QLatin1Char('_')) {
const QString wordUnderCursor = editor->textAt(i, pos - i);
if (wordUnderCursor.at(0).isLetter() || wordUnderCursor.at(0) == QLatin1Char('_')) {
foreach (const TextEditor::CompletionItem &i, m_completions) {
if (i.text == wordUnderCursor) {
cleanup();
return -1;
}
}
} else {
cleanup();
return -1;
}
} else
break;
}
}
}
if (m_completionOperator != T_EOF_SYMBOL)
qSort(m_completions.begin(), m_completions.end(), completionItemLessThan);