From 209078e57e97cd45c213c58a21df02c9a1ad89c8 Mon Sep 17 00:00:00 2001
From: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Date: Fri, 6 Feb 2015 12:16:08 +0100
Subject: [PATCH] C++: fix dereferencing of nested type and operator '*'

Fixed case:
template<class T>
struct List
{
  struct iterator
  {
    T &operator*() { return t; }
    T t;
  };
  iterator begin() { return iterator(); }
};

struct Foo { int bar; };

void func()
{
  List<Foo> list;
  (*list.begin()).; // code completion doesn't work
}

Task-number: QTCREATORBUG-13799
Change-Id: Ia3f5c1631c2f6a25d7fb1186b4ef506354ed22be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
 src/libs/cplusplus/ResolveExpression.cpp    |  2 +-
 src/plugins/cpptools/cppcompletion_test.cpp | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index c1a277f74e3..5ea8392ee6b 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -612,7 +612,7 @@ bool ResolveExpression::visit(UnaryExpressionAST *ast)
                 added = true;
             } else if (namedTy != 0) {
                 const Name *starOp = control()->operatorNameId(OperatorNameId::StarOp);
-                if (ClassOrNamespace *b = _context.lookupType(namedTy->name(), p.scope())) {
+                if (ClassOrNamespace *b = _context.lookupType(namedTy->name(), p.scope(), p.binding())) {
                     foreach (const LookupItem &r, b->find(starOp)) {
                         Symbol *overload = r.declaration();
                         if (Function *funTy = overload->type()->asFunctionType()) {
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index dd5bbe2ecda..f51cdb0d3a2 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -2513,6 +2513,26 @@ void CppToolsPlugin::test_completion_data()
     ) << _("s->") << (QStringList()
         << QLatin1String("Foo")
         << QLatin1String("bar"));
+
+    QTest::newRow("dereference_of_nested_type_opertor_*") << _(
+            "template<typename T>\n"
+            "struct QList\n"
+            "{\n"
+            "   struct iterator\n"
+            "   {\n"
+            "      T &operator*() { return t; }\n"
+            "      T t;\n"
+            "   };\n"
+            "   iterator begin() { return iterator(); }\n"
+            "};\n"
+            "struct Foo { int bar; };\n"
+            "void fun() {\n"
+            "   QList<Foo> list;\n"
+            "   @\n"
+            "}\n"
+    ) << _("(*list.begin()).") << (QStringList()
+        << QLatin1String("Foo")
+        << QLatin1String("bar"));
 }
 
 void CppToolsPlugin::test_completion_member_access_operator()