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

Check the current under cursor before searching for the enclosing expression.

Browse Source
This commit is contained in:
Roberto Raggi
2010-06-01 12:16:13 +02:00
parent 619d50f080
commit ef83369006
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -585,6 +585,11 @@ struct FindCanonicalSymbol
return typeOfExpression.context();
}
inline bool isIdentifierChar(const QChar &ch) const
{
return ch.isLetterOrNumber() || ch == QLatin1Char('_');
}
Symbol *operator()(const QTextCursor &cursor)
{
if (! info.doc)
@@ -598,8 +603,12 @@ struct FindCanonicalSymbol
QTextDocument *document = editor->document();
int pos = tc.position();
while (document->characterAt(pos).isLetterOrNumber() ||
document->characterAt(pos) == QLatin1Char('_'))
if (! isIdentifierChar(document->characterAt(pos)))
if (! (pos > 0 && isIdentifierChar(document->characterAt(pos - 1))))
return 0;
while (isIdentifierChar(document->characterAt(pos)))
++pos;
tc.setPosition(pos);