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

clangbackend: Fix token length calculation

Browse Source 
This was broken for tokens with characters that take up more than one
byte.

Fixes: QTCREATORBUG-25715
Change-Id: Ic9842b960af8d6f12487f582b100cb2edcf48cc1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-05-12 14:49:46 +02:00
parent 0c5427c642
commit 3113b0e6d6
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/clangbackend/source/tokeninfo.cpp
View File

@@ -49,7 +49,9 @@ TokenInfo::TokenInfo(const Cursor &cursor,
m_line = start.line(); m_line = start.line();
m_column = start.column(); m_column = start.column();
m_offset = start.offset(); m_offset = start.offset();
m_length = end.offset() - start.offset(); m_length = token->spelling().operator Utf8String().toString().size();
if (m_length == 0)
m_length = end.offset() - start.offset(); // Just for safety.
} }
bool TokenInfo::hasInvalidMainType() const bool TokenInfo::hasInvalidMainType() const

2
tests/unit/unittest/data/highlightingmarks.cpp
View File

@@ -788,3 +788,5 @@ static inline constexpr vecn<T, S> operator<(vecn<T, S> a, vecn<T, S> b)
} }
return x; return x;
} }
const char *cyrillic = "б";

6
tests/unit/unittest/tokenprocessor-test.cpp
View File

@@ -1807,6 +1807,12 @@ TEST_F(TokenProcessor, OperatorInTemplate)
ASSERT_THAT(infos[9], HasOnlyType(HighlightingType::Punctuation)); ASSERT_THAT(infos[9], HasOnlyType(HighlightingType::Punctuation));
} }
TEST_F(TokenProcessor, CyrillicString)
{
const auto infos = translationUnit.tokenInfosInRange(sourceRange(792, 28));
ASSERT_THAT(infos[5], IsHighlightingMark(792u, 24u, 3u, HighlightingType::StringLiteral));
}
Data *TokenProcessor::d; Data *TokenProcessor::d;
void TokenProcessor::SetUpTestCase() void TokenProcessor::SetUpTestCase()