C++: Fix (Find)LocalSymbols for lambda parameters

Change-Id: I5cb69749b4f15e4f70dea410aa6f943c4189c502
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

2 files changed, 25 insertions, 0 deletions

diff --git a/src/plugins/cpptools/cpplocalsymbols.cpp b/src/plugins/cpptools/cpplocalsymbols.cpp
index 18606167a7..e491589fc6 100644
--- a/src/plugins/cpptools/cpplocalsymbols.cpp
+++ b/src/plugins/cpptools/cpplocalsymbols.cpp
@@ -175,6 +175,19 @@ protected:
             _scopeStack.removeLast();
     }
 
+    virtual bool visit(LambdaExpressionAST *ast)
+    {
+        if (ast->lambda_declarator && ast->lambda_declarator->symbol)
+            enterScope(ast->lambda_declarator->symbol);
+        return true;
+    }
+
+    virtual void endVisit(LambdaExpressionAST *ast)
+    {
+        if (ast->lambda_declarator && ast->lambda_declarator->symbol)
+            _scopeStack.removeLast();
+    }
+
     virtual bool visit(CompoundStatementAST *ast)
     {
         if (ast->symbol)
diff --git a/src/plugins/cpptools/cpplocalsymbols_test.cpp b/src/plugins/cpptools/cpplocalsymbols_test.cpp
index eb986b8430..2a238755dd 100644
--- a/src/plugins/cpptools/cpplocalsymbols_test.cpp
+++ b/src/plugins/cpptools/cpplocalsymbols_test.cpp
@@ -157,6 +157,18 @@ void CppToolsPlugin::test_cpplocalsymbols_data()
             << Result(_("local"), 3, 8, 5)
             << Result(_("local"), 4, 12, 5)
             << Result(_("arg"), 4, 20, 3));
+
+    QTest::newRow("lambda")
+        << _("void f()\n"
+             "{\n"
+             "    auto func = [](int arg) { return arg; };\n"
+             "    func(1);\n"
+             "}\n")
+        << (QList<Result>()
+            << Result(_("func"), 2, 10, 4)
+            << Result(_("arg"), 2, 24, 3)
+            << Result(_("arg"), 2, 38, 3)
+            << Result(_("func"), 3, 5, 4));
 }
 
 void CppToolsPlugin::test_cpplocalsymbols()