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

clangbackend: Another workaround for missing libclang cursor information

Browse Source 
Prevent identifiers in function (parameter) attributes from being
reported as the surrounding scope (e.g. a namespace), breaking
highlighting and outline.

Fixes: QTCREATORBUG-24650
Task-number: QTCREATORBUG-24636
Change-Id: I1a6694e3b9a96cbb0181d137ee2bb8294c4172b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-10 15:34:20 +01:00
parent ba2262a870
commit 30c1652d10
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/tools/clangbackend/source/token.cpp
View File

@@ -96,13 +96,17 @@ std::vector<Cursor> Tokens::annotate() const
// The alias declaration "using S = struct {}" results in libclang reporting the type // The alias declaration "using S = struct {}" results in libclang reporting the type
// of the surrounding scope (e.g. a namespace or class) for the cursor corresponding to // of the surrounding scope (e.g. a namespace or class) for the cursor corresponding to
// the token "S" (QTCREATORBUG-24875). We need to correct this manually. // the token "S" (QTCREATORBUG-24875). We need to correct this manually.
// The same goes for function attributes like "[[deprecated]]".
// TODO: Investigate whether we can fix this in libclang itself. // TODO: Investigate whether we can fix this in libclang itself.
for (int i = 1; i < int(m_tokens.size()) - 2; ++i) { for (int i = 1; i < int(m_tokens.size()) - 2; ++i) {
const Token &tok = m_tokens.at(i); const Token &tok = m_tokens.at(i);
if (tok.kind() != CXToken_Identifier)
continue;
const Token &prevTok = m_tokens.at(i - 1); const Token &prevTok = m_tokens.at(i - 1);
const Token &nextTok = m_tokens.at(i + 1); const Token &nextTok = m_tokens.at(i + 1);
if (tok.kind() == CXToken_Identifier
&& prevTok.kind() == CXToken_Keyword // QTCREATORBUG-24875
if (prevTok.kind() == CXToken_Keyword
&& prevTok.spelling() == "using" && prevTok.spelling() == "using"
&& nextTok.spelling() == "=" && nextTok.spelling() == "="
&& cxCursors.at(i).kind != CXCursor_TypeAliasDecl) { && cxCursors.at(i).kind != CXCursor_TypeAliasDecl) {
@@ -118,6 +122,27 @@ std::vector<Cursor> Tokens::annotate() const
m_cxTranslationUnit, *m_tokens.at(i + 2).cx())); m_cxTranslationUnit, *m_tokens.at(i + 2).cx()));
} }
cxCursors[i] = nextCursor; cxCursors[i] = nextCursor;
continue;
}
// QTCREATORBUG-24636, QTCREATORBUG-24650
if (i >= 2 && i < int(m_tokens.size()) - 3) {
const Token &prevPrevTok = m_tokens.at(i - 2);
const Token &nextNextTok = m_tokens.at(i + 2);
if (prevTok.kind() == CXToken_Punctuation && prevTok.spelling() == "["
&& prevPrevTok.kind() == CXToken_Punctuation && prevPrevTok.spelling() == "["
&& nextTok.kind() == CXToken_Punctuation && nextTok.spelling() == "]"
&& nextNextTok.kind() == CXToken_Punctuation && nextNextTok.spelling() == "]") {
for (int j = i + 3; j < int(m_tokens.size()); ++j) {
if (cxCursors[j] == cxCursors[j - 1])
continue;
if (cxCursors[j].kind == CXCursor_FunctionDecl
|| cxCursors[j].kind == CXCursor_ParmDecl) {
cxCursors[i] = clang_getNullCursor();
}
break;
}
}
} }
} }