C++: fixed operator* for nested class of enclosing template class

Fixed:
* highlighting
* follow symbol
* find usage

Task-number: QTCREATORBUG-9006

Change-Id: I34a42f8665335857f41290217e7265e8a752455b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

1 files changed, 46 insertions, 0 deletions

diff --git a/tests/auto/cplusplus/findusages/tst_findusages.cpp b/tests/auto/cplusplus/findusages/tst_findusages.cpp
index 339d852ca0..f2098ab838 100644
--- a/tests/auto/cplusplus/findusages/tst_findusages.cpp
+++ b/tests/auto/cplusplus/findusages/tst_findusages.cpp
@@ -94,6 +94,7 @@ private Q_SLOTS:
 
     // templates
     void instantiateTemplateWithNestedClass();
+    void operatorAsteriskOfNestedClassOfTemplateClass_QTCREATORBUG9006();
 };
 
 void tst_FindUsages::inlineMethod()
@@ -444,5 +445,50 @@ void tst_FindUsages::instantiateTemplateWithNestedClass()
     QCOMPARE(findUsages.usages().size(), 2);
 }
 
+void tst_FindUsages::operatorAsteriskOfNestedClassOfTemplateClass_QTCREATORBUG9006()
+{
+    const QByteArray src = "\n"
+            "struct Foo { int foo; };\n"
+            "\n"
+            "template<class T>\n"
+            "struct Outer\n"
+            "{\n"
+            "  struct Nested\n"
+            "  {\n"
+            "    const T &operator*() { return t; }\n"
+            "    T t;\n"
+            "  };\n"
+            "};\n"
+            "\n"
+            "void bug()\n"
+            "{\n"
+            "  Outer<Foo>::Nested nested;\n"
+            "  (*nested).foo;\n"
+            "}\n"
+            ;
+
+    Document::Ptr doc = Document::create("operatorAsteriskOfNestedClassOfTemplateClass_QTCREATORBUG9006");
+    doc->setUtf8Source(src);
+    doc->parse();
+    doc->check();
+
+    QVERIFY(doc->diagnosticMessages().isEmpty());
+    QCOMPARE(doc->globalSymbolCount(), 3U);
+
+    Snapshot snapshot;
+    snapshot.insert(doc);
+
+    Class *classFoo = doc->globalSymbolAt(0)->asClass();
+    QVERIFY(classFoo);
+    QCOMPARE(classFoo->memberCount(), 1U);
+    Declaration *fooDeclaration = classFoo->memberAt(0)->asDeclaration();
+    QVERIFY(fooDeclaration);
+    QCOMPARE(fooDeclaration->name()->identifier()->chars(), "foo");
+
+    FindUsages findUsages(src, doc, snapshot);
+    findUsages(fooDeclaration);
+    QCOMPARE(findUsages.usages().size(), 2);
+}
+
 QTEST_APPLESS_MAIN(tst_FindUsages)
 #include "tst_findusages.moc"