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

Fixed: Wrong usage highlighting if function's argument list contains comment.

Browse Source 
Task-number: QTCREATORBUG-577
This commit is contained in:
Roberto Raggi
2010-03-03 14:09:38 +01:00
parent a673fb7120
commit 293f67580d
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/cplusplus/pp-engine.cpp
View File

@@ -662,6 +662,21 @@ bool Preprocessor::markGeneratedTokens(bool markGeneratedTokens,
return previous;
}
bool Preprocessor::maybeAfterComment() const
{
unsigned endOfPreviousToken = 0;
if (_dot != _tokens.constBegin())
endOfPreviousToken = (_dot - 1)->end();
const char *start = _source.constBegin() + endOfPreviousToken;
if (*start == '/')
return true;
return false;
}
void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
QByteArray *result)
{
@@ -710,7 +725,7 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
} else {
if (_dot->f.whitespace) {
if (_dot->f.whitespace || maybeAfterComment()) {
unsigned endOfPreviousToken = 0;
if (_dot != _tokens.constBegin())