Merge remote-tracking branch 'origin/4.15'

Change-Id: Ia6558fc2423fd9cd84ca2282bfa60d102dff682e
2021-05-19 09:54:07 +02:00
parent c49a0af504 801dbdf932
commit f83be6debe
21 changed files with 164 additions and 35 deletions
--- a/tests/unit/unittest/tokenprocessor-test.cpp
+++ b/tests/unit/unittest/tokenprocessor-test.cpp
@@ -1813,6 +1813,12 @@ TEST_F(TokenProcessor, CyrillicString)
    ASSERT_THAT(infos[5], IsHighlightingMark(792u, 24u, 3u, HighlightingType::StringLiteral));
 }

+TEST_F(TokenProcessor, PreProcessorInStruct)
+{
+    const auto infos = translationUnit.tokenInfosInRange(sourceRange(793, 14));
+    ASSERT_THAT(infos[1], HasOnlyType(HighlightingType::Preprocessor));
+}
+
 Data *TokenProcessor::d;

 void TokenProcessor::SetUpTestCase()