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

Clang: Fix comma-separated class members in symbol outline

Browse Source 
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>
This commit is contained in:
Ivan Donchevskii
2018-06-27 10:47:16 +02:00
parent ef9c68798d
commit fcfa98ab7c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/clangbackend/source/tokenprocessor.h
View File

@@ -159,6 +159,10 @@ QVector<TokenInfoContainer> TokenProcessor<FullTokenInfo>::toTokenInfoContainers
if (it->m_extraInfo.declaration && !it->hasMainType(HighlightingType::LocalVariable) if (it->m_extraInfo.declaration && !it->hasMainType(HighlightingType::LocalVariable)
&& it->m_originalCursor != token.m_originalCursor && it->m_originalCursor != token.m_originalCursor
&& it->m_extraInfo.cursorRange.contains(tokenStart)) { && 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; token.m_extraInfo.lexicalParentIndex = std::distance(it, tokens.rend()) - 1;
break; break;
} }