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

Make sure the BackwardScanner has tokenized before asking for a string.

Browse Source 
The problem was that for

Foo::Foo
(|)

when the user triggers completion at |, startOfLine() returns a token
that's not on the current line and not yet tokenized by that instance
of the BackwardScanner.

As a fix I explicitly ask the instance to tokenize up to the given
index.

Task-number: QTCREATORBUG-673
Reviewed-by: Roberto Raggi
This commit is contained in:
Christian Kamm
2010-03-11 10:57:46 +01:00
parent 2b40ed698a
commit 5a7858f5ec
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1076,7 +1076,11 @@ bool CppCodeCompletion::completeConstructorOrFunction(const QList<LookupItem> &r
QTextCursor tc(edit->document()); QTextCursor tc(edit->document());
tc.setPosition(endOfExpression); tc.setPosition(endOfExpression);
BackwardsScanner bs(tc); BackwardsScanner bs(tc);
QString possibleDecl = bs.mid(bs.startOfLine(bs.startToken())).trimmed().append("();"); const int startToken = bs.startToken();
const int lineStartToken = bs.startOfLine(startToken);
// make sure the required tokens are actually available
bs.LA(startToken - lineStartToken);
QString possibleDecl = bs.mid(lineStartToken).trimmed().append("();");
Document::Ptr doc = Document::create(QLatin1String("<completion>")); Document::Ptr doc = Document::create(QLatin1String("<completion>"));
doc->setSource(possibleDecl.toLatin1()); doc->setSource(possibleDecl.toLatin1());