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

C++: Fix unit-tests for MatchingText

Browse Source 
BackwardScanner required more investigation and this is
the better fix than 413c66ec.

Change-Id: I651a7b416b549cc4a0e086873262d04409a7448e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-02-20 11:53:00 +01:00
parent 4286a4d507
commit 1d2b27081a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/cplusplus/MatchingText.cpp
View File

@@ -324,7 +324,7 @@ static bool isRecordLikeToken(const Token &token)
static bool isRecordLikeToken(const BackwardsScanner &tokens, int index)
{
if (index < tokens.size() - 1)
if (index + tokens.offset() < tokens.size() - 1)
return isRecordLikeToken(tokens[index]);
return false;
}
@@ -347,7 +347,7 @@ static bool recordLikeMightFollowToken(const Token &token)
static bool isAfterRecordLikeDefinition(const BackwardsScanner &tokens, int index)
{
for (; index >= 0; --index) {
for (;; --index) {
if (recordLikeHasToFollowToken(tokens[index]))
return isRecordLikeToken(tokens, index + 1);