From fcfa98ab7ce491808283b47780011acaa611a07d Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Wed, 27 Jun 2018 10:47:16 +0200
Subject: Clang: Fix comma-separated class members in symbol outline

Check for the actual lexical parent in addition to ranges.

Task-number: QTCREATORBUG-20656
Change-Id: Ie2ead5cd02e83f9fd201825ee80d1633679a6402
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/tools/clangbackend/source/tokenprocessor.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/tools/clangbackend/source/tokenprocessor.h b/src/tools/clangbackend/source/tokenprocessor.h
index 4c6fbd995d..aeac7dc01c 100644
--- a/src/tools/clangbackend/source/tokenprocessor.h
+++ b/src/tools/clangbackend/source/tokenprocessor.h
@@ -159,6 +159,10 @@ QVector<TokenInfoContainer> TokenProcessor<FullTokenInfo>::toTokenInfoContainers
             if (it->m_extraInfo.declaration && !it->hasMainType(HighlightingType::LocalVariable)
                     && it->m_originalCursor != token.m_originalCursor
                     && it->m_extraInfo.cursorRange.contains(tokenStart)) {
+                if (token.m_originalCursor.lexicalParent() != it->m_originalCursor
+                        && !token.hasMainType(HighlightingType::QtProperty)) {
+                    continue;
+                }
                 token.m_extraInfo.lexicalParentIndex = std::distance(it, tokens.rend()) - 1;
                 break;
             }
-- 
cgit v1.2.3