diff --git a/src/libs/3rdparty/cplusplus/AST.h b/src/libs/3rdparty/cplusplus/AST.h index d102db0fe0d..76213cc2c37 100644 --- a/src/libs/3rdparty/cplusplus/AST.h +++ b/src/libs/3rdparty/cplusplus/AST.h @@ -4455,6 +4455,9 @@ public: ExceptionSpecificationAST *exception_specification; TrailingReturnTypeAST *trailing_return_type; +public: // annotations + Function *symbol; + public: LambdaDeclaratorAST() : lparen_token(0) diff --git a/src/libs/3rdparty/cplusplus/Bind.cpp b/src/libs/3rdparty/cplusplus/Bind.cpp index 7fd65e24d47..e6245eb0365 100644 --- a/src/libs/3rdparty/cplusplus/Bind.cpp +++ b/src/libs/3rdparty/cplusplus/Bind.cpp @@ -1098,6 +1098,7 @@ Function *Bind::lambdaDeclarator(LambdaDeclaratorAST *ast) if (ast->trailing_return_type) _type = this->trailingReturnType(ast->trailing_return_type, _type); fun->setReturnType(_type); + ast->symbol = fun; // unsigned lparen_token = ast->lparen_token; FullySpecifiedType type; diff --git a/src/plugins/cpptools/cpplocalsymbols.cpp b/src/plugins/cpptools/cpplocalsymbols.cpp index 18606167a70..e491589fc6e 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 eb986b8430a..2a238755dd2 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(_("func"), 2, 10, 4) + << Result(_("arg"), 2, 24, 3) + << Result(_("arg"), 2, 38, 3) + << Result(_("func"), 3, 5, 4)); } void CppToolsPlugin::test_cpplocalsymbols()