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

ClangCodeModel: Relax check for const-ness

Browse Source 
... when detecting output arguments with clangd.
This should lead to fewer false positives. We plan to handle false
negatives on a case-by-case basis (rather than the other way around).

Change-Id: I541b418927dc410c2ea4ea9f6c1b5a7bd291a1a8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-12-09 16:01:46 +01:00
parent fc3b7f7ac5
commit 5f15e1f066
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2605,8 +2605,6 @@ static void semanticHighlighter(QFutureInterface<HighlightingResult> &future,
const QList<AstNode> path = getAstPath(ast, range); const QList<AstNode> path = getAstPath(ast, range);
if (path.size() < 2) if (path.size() < 2)
return false; return false;
if (path.last().hasConstType())
return false;
for (auto it = path.rbegin() + 1; it != path.rend(); ++it) { for (auto it = path.rbegin() + 1; it != path.rend(); ++it) {
if (it->kind() == "Call" || it->kind() == "CXXConstruct" if (it->kind() == "Call" || it->kind() == "CXXConstruct"
|| it->kind() == "MemberInitializer") { || it->kind() == "MemberInitializer") {
@@ -2636,7 +2634,7 @@ static void semanticHighlighter(QFutureInterface<HighlightingResult> &future,
if (it->kind() == "Lambda") if (it->kind() == "Lambda")
return false; return false;
if (it->kind().endsWith("Cast") && it->hasConstType()) if (it->hasConstType())
return false; return false;
if (it->kind() == "Member" && it->arcanaContains("(") if (it->kind() == "Member" && it->arcanaContains("(")
&& !it->arcanaContains("bound member function type")) { && !it->arcanaContains("bound member function type")) {

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

@@ -1277,6 +1277,8 @@ void ClangdTestHighlighting::test_data()
<< QList<int>{C_STRING} << 0; << QList<int>{C_STRING} << 0;
QTest::newRow("user-defined operator call") << 860 << 7 << 860 << 8 QTest::newRow("user-defined operator call") << 860 << 7 << 860 << 8
<< QList<int>{C_LOCAL} << 0; << QList<int>{C_LOCAL} << 0;
QTest::newRow("const member as function argument") << 868 << 32 << 868 << 43
<< QList<int>{C_FIELD} << 0;
} }
void ClangdTestHighlighting::test() void ClangdTestHighlighting::test()

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

@@ -859,3 +859,13 @@ void useOperator()
struct S { S& operator++(); } s; struct S { S& operator++(); } s;
++s; ++s;
} }
static void takesFoo(const Foo &);
void constMemberAsFunctionArg()
{
struct S {
S(const Foo& f) : constMember(f) {}
void func() { takesFoo(constMember); }
const Foo &constMember;
};
}