diff --git a/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.h b/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.h --- a/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.h +++ b/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.h @@ -31,6 +31,9 @@ void storeOptions(ClangTidyOptions::OptionMap &Opts) override; void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; + llvm::Optional getCheckTraversalKind() const override { + return TK_IgnoreUnlessSpelledInSource; + } private: const unsigned Threshold; diff --git a/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp b/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp --- a/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp @@ -502,27 +502,40 @@ void FunctionCognitiveComplexityCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher( functionDecl(isDefinition(), - unless(anyOf(isDefaulted(), isDeleted(), isImplicit(), - isInstantiated(), isWeak()))) + unless(anyOf(isDefaulted(), isDeleted(), isWeak()))) .bind("func"), this); + Finder->addMatcher(lambdaExpr().bind("lambda"), this); } void FunctionCognitiveComplexityCheck::check( const MatchFinder::MatchResult &Result) { - const auto *Func = Result.Nodes.getNodeAs("func"); - assert(Func->hasBody() && "The matchers should only match the functions that " - "have user-provided body."); FunctionASTVisitor Visitor; - Visitor.TraverseDecl(const_cast(Func), true); + SourceLocation Loc; + + const auto *TheDecl = Result.Nodes.getNodeAs("func"); + const auto *TheLambdaExpr = Result.Nodes.getNodeAs("lambda"); + if (TheDecl) { + assert(TheDecl->hasBody() && + "The matchers should only match the functions that " + "have user-provided body."); + Loc = TheDecl->getLocation(); + Visitor.TraverseDecl(const_cast(TheDecl), true); + } else { + Loc = TheLambdaExpr->getBeginLoc(); + Visitor.TraverseLambdaExpr(const_cast(TheLambdaExpr)); + } if (Visitor.CC.Total <= Threshold) return; - diag(Func->getLocation(), - "function %0 has cognitive complexity of %1 (threshold %2)") - << Func << Visitor.CC.Total << Threshold; + if (TheDecl) + diag(Loc, "function %0 has cognitive complexity of %1 (threshold %2)") + << TheDecl << Visitor.CC.Total << Threshold; + else + diag(Loc, "lambda has cognitive complexity of %0 (threshold %1)") + << Visitor.CC.Total << Threshold; // Output all the basic increments of complexity. for (const auto &Detail : Visitor.CC.Details) { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity.cpp @@ -666,7 +666,7 @@ // CHECK-NOTES: :[[@LINE-1]]:5: note: +2, including nesting penalty of 1, nesting level increased to 2{{$}} } }; -// CHECK-NOTES: :[[@LINE-6]]:14: warning: function 'operator()' has cognitive complexity of 1 (threshold 0) [readability-function-cognitive-complexity] +// CHECK-NOTES: :[[@LINE-6]]:14: warning: lambda has cognitive complexity of 1 (threshold 0) [readability-function-cognitive-complexity] // CHECK-NOTES: :[[@LINE-5]]:5: note: +1, including nesting penalty of 0, nesting level increased to 1{{$}} }