ClangCodeModel: Fix highlighting problem with template types

With clangd, we mis-detected variables of template types as output
parameters in certain contexts.

Change-Id: I906abd489f987351793f4ef676e4af59cdfdbf97
Reviewed-by: David Schulz <david.schulz@qt.io>

3 files changed, 17 insertions, 0 deletions

diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index 09f9cedd19..fddf22e009 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -252,6 +252,16 @@ public:
         QString theType = type();
         if (theType.endsWith("const"))
             theType.chop(5);
+
+        // We don't care about the "inner" type of templates.
+        const int openAngleBracketPos = theType.indexOf('<');
+        if (openAngleBracketPos != -1) {
+            const int closingAngleBracketPos = theType.lastIndexOf('>');
+            if (closingAngleBracketPos > openAngleBracketPos) {
+                theType = theType.left(openAngleBracketPos)
+                        + theType.mid(closingAngleBracketPos + 1);
+            }
+        }
         const int xrefCount = theType.count("&&");
         const int refCount = theType.count('&') - 2 * xrefCount;
         const int ptrRefCount = theType.count('*') + refCount;
diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index 927728d875..82e63d4983 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -1249,6 +1249,7 @@ void ClangdTestHighlighting::test_data()
     QTest::newRow("const argument to unnamed lambda") << 830 << 16 << 830 << 19
         << QList<int>{C_LOCAL} << 0;
     QTest::newRow("simple assignment") << 835 << 5 << 835 << 6 << QList<int>{C_LOCAL} << 0;
+    QTest::newRow("simple return") << 841 << 12 << 841 << 15 << QList<int>{C_LOCAL} << 0;
 }
 
 void ClangdTestHighlighting::test()
diff --git a/src/plugins/clangcodemodel/test/data/highlighting/highlighting.cpp b/src/plugins/clangcodemodel/test/data/highlighting/highlighting.cpp
index 652d9540c8..7f8faa1edc 100644
--- a/src/plugins/clangcodemodel/test/data/highlighting/highlighting.cpp
+++ b/src/plugins/clangcodemodel/test/data/highlighting/highlighting.cpp
@@ -834,3 +834,9 @@ void assignmentTest() {
     struct S {} s;
     s = {};
 }
+
+using FooPtrVector = std::vector<Foo *>;
+FooPtrVector returnTest()  {
+    FooPtrVector foo;
+    return foo;
+}