diff options
3 files changed, 16 insertions, 1 deletions
diff --git a/src/tools/clangbackend/ipcsource/highlightinginformation.cpp b/src/tools/clangbackend/ipcsource/highlightinginformation.cpp index 6309ec527a..1483062c33 100644 --- a/src/tools/clangbackend/ipcsource/highlightinginformation.cpp +++ b/src/tools/clangbackend/ipcsource/highlightinginformation.cpp @@ -201,6 +201,7 @@ HighlightingType HighlightingInformation::identifierKind(const Cursor &cursor) c case CXCursor_TemplateTemplateParameter: case CXCursor_UnionDecl: case CXCursor_StructDecl: + case CXCursor_OverloadedDeclRef: case CXCursor_TemplateRef: case CXCursor_Namespace: case CXCursor_NamespaceRef: diff --git a/tests/unit/unittest/data/highlightinginformations.cpp b/tests/unit/unittest/data/highlightinginformations.cpp index ca7eaa392f..8d341164fc 100644 --- a/tests/unit/unittest/data/highlightinginformations.cpp +++ b/tests/unit/unittest/data/highlightinginformations.cpp @@ -162,7 +162,7 @@ struct StructInNameSpace {}; } namespace NameSpaceAlias = NameSpace; - +using NameSpace::StructInNameSpace; NameSpace::StructInNameSpace foo6; class BaseClass { diff --git a/tests/unit/unittest/highlightinginformationstest.cpp b/tests/unit/unittest/highlightinginformationstest.cpp index 29e68042b6..bf9f4a33f8 100644 --- a/tests/unit/unittest/highlightinginformationstest.cpp +++ b/tests/unit/unittest/highlightinginformationstest.cpp @@ -462,6 +462,13 @@ TEST_F(HighlightingInformations, NameSpaceAlias) ASSERT_THAT(infos[1], HasType(HighlightingType::Type)); } +TEST_F(HighlightingInformations, UsingStructInNameSpace) +{ + const auto infos = translationUnit.highlightingInformationsInRange(sourceRange(165, 36)); + + ASSERT_THAT(infos[3], HasType(HighlightingType::Type)); +} + TEST_F(HighlightingInformations, NameSpaceReference) { const auto infos = translationUnit.highlightingInformationsInRange(sourceRange(166, 35)); @@ -469,6 +476,13 @@ TEST_F(HighlightingInformations, NameSpaceReference) ASSERT_THAT(infos[0], HasType(HighlightingType::Type)); } +TEST_F(HighlightingInformations, StructInNameSpaceReference) +{ + const auto infos = translationUnit.highlightingInformationsInRange(sourceRange(166, 35)); + + ASSERT_THAT(infos[2], HasType(HighlightingType::Type)); +} + TEST_F(HighlightingInformations, VirtualFunction) { const auto infos = translationUnit.highlightingInformationsInRange(sourceRange(170, 35)); |