From a1b910724decf22e2d64d7ed78923e6dbfa23f58 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 30 Mar 2022 17:31:26 +0200
Subject: [PATCH] ClangCodeModel: Fix local renamings with clangd

This functionality somehow stayed in the proof-of-concept
stage, working only for free functions.

Fixes: QTCREATORBUG-27249
Change-Id: I840beae66314330ce643e159c596e702a0ec3273
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/clangcodemodel/clangdclient.cpp     | 5 ++++-
 src/plugins/clangcodemodel/test/clangdtests.cpp | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index 6d343c62a2a..ab08f9cc96f 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -1989,7 +1989,10 @@ void ClangdClient::findLocalUsages(TextDocument *document, const QTextCursor &cu
             const QList<AstNode> astPath = getAstPath(ast, linkPos);
             bool isVar = false;
             for (auto it = astPath.rbegin(); it != astPath.rend(); ++it) {
-                if (it->role() == "declaration" && it->kind() == "Function") {
+                if (it->role() == "declaration"
+                        && (it->kind() == "Function" || it->kind() == "CXXMethod"
+                            || it->kind() == "CXXConstructor" || it->kind() == "CXXDestructor"
+                            || it->kind() == "Lambda")) {
                     if (!isVar)
                         break;
 
diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index b672dec291d..0381bd25772 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -434,8 +434,8 @@ void ClangdTestLocalReferences::test_data()
             /* QList<Range>{{40, 7, 3}, {43, 9, 3}} */;
     QTest::newRow("instantiated template object") << 52 << 19
                                                   << QList<Range>{{52, 19, 3}, {53, 5, 3}};
-    QTest::newRow("variable in template") << 62 << 13 << QList<Range>()
-            /* QList<Range>{{62, 13, 3}, {63, 11, 3}} */;
+    QTest::newRow("variable in template") << 62 << 13
+                                          << QList<Range>{{62, 13, 3}, {63, 11, 3}};
     QTest::newRow("member in template") << 67 << 7 << QList<Range>()
             /* QList<Range>{{64, 16, 3}, {67, 7, 3}} */;
     QTest::newRow("template type") << 58 << 19 << QList<Range>()