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

ClangCodeModel: Do not highlight argument of operator*

Browse Source 
... as output parameter with clangd.

Task-number: QTCREATORBUG-27111
Change-Id: I5def562dcb9b8b0dac036fd46ed7e996c0297c95
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2022-02-28 16:02:59 +01:00
parent c7d2b8d5cb
commit 41038ba8cf
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -2711,7 +2711,8 @@ static void semanticHighlighter(QFutureInterface<HighlightingResult> &future,
if (detail.startsWith("operator")) { if (detail.startsWith("operator")) {
return !detail.contains('=') return !detail.contains('=')
&& !detail.contains("++") && !detail.contains("--") && !detail.contains("++") && !detail.contains("--")
&& !detail.contains("<<") && !detail.contains(">>"); && !detail.contains("<<") && !detail.contains(">>")
&& !detail.contains("*");
} }
firstChildTree << n.children().value_or(QList<AstNode>()); firstChildTree << n.children().value_or(QList<AstNode>());
} }

2
src/plugins/clangcodemodel/test/clangdtests.cpp
View File

@@ -1308,6 +1308,8 @@ void ClangdTestHighlighting::test_data()
<< QList<int>{C_PREPROCESSOR} << 0; << QList<int>{C_PREPROCESSOR} << 0;
QTest::newRow("built-in define 3") << 952 << 21 << 952 << 40 QTest::newRow("built-in define 3") << 952 << 21 << 952 << 40
<< QList<int>{C_PREPROCESSOR} << 0; << QList<int>{C_PREPROCESSOR} << 0;
QTest::newRow("deref operator (object)") << 960 << 10 << 960 << 11 << QList<int>{C_LOCAL} << 0;
QTest::newRow("deref operator (member)") << 960 << 12 << 960 << 13 << QList<int>{C_FIELD} << 0;
} }
void ClangdTestHighlighting::test() void ClangdTestHighlighting::test()

9
src/plugins/clangcodemodel/test/data/highlighting/highlighting.cpp
View File

@@ -951,3 +951,12 @@ void builtinDefines()
const auto f2 = __FUNCTION__; const auto f2 = __FUNCTION__;
const auto f3 = __PRETTY_FUNCTION__; const auto f3 = __PRETTY_FUNCTION__;
} }
void derefOperator()
{
struct S { bool operator*(); };
struct S2 { S s; };
S2 s;
if (*s.s)
return;
}