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

Completion: Ignore non identifiers when matching proposals

Browse Source 
Since now we reduced the idle editor time for showing completions,
some things started to be a bit annoying. This fix changes the
prefix from the proposal to include only letters, digits, and the
underscore. Yes, technically they are not allways identifiers
in a generic sense, but it should be enough for our purpose.

Now, you should not receive a proposal 'foo:' when you have already
typed 'foo' in QML, for example.

Change-Id: Ica92182a34636598faedb067d0527e37ca6fee89
Reviewed-on: http://codereview.qt.nokia.com/46
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Leandro Melo
2011-05-20 12:29:40 +02:00
committed by Leandro T. C. Melo
parent 99fee33fd1
commit 1c60ae1039
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
View File

@@ -241,6 +241,14 @@ QString BasicProposalItemListModel::proposalPrefix() const
// Compute common prefix // Compute common prefix
QString firstKey = m_currentItems.first()->text(); QString firstKey = m_currentItems.first()->text();
int ignore = 0;
for (int i = firstKey.length() - 1; i >= 0; --i, ++ignore) {
const QChar &c = firstKey.at(i);
if (c.isLetterOrNumber() || c == QLatin1Char('_'))
break;
}
if (ignore)
firstKey.chop(ignore);
QString lastKey = m_currentItems.last()->text(); QString lastKey = m_currentItems.last()->text();
const int length = qMin(firstKey.length(), lastKey.length()); const int length = qMin(firstKey.length(), lastKey.length());
firstKey.truncate(length); firstKey.truncate(length);