[clang-format] Fix a bug in parsing C-style cast of lambdas (#136099)
Fix #135959
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index b9430d4..df58e5e 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -2368,13 +2368,25 @@
const FormatToken *Previous = FormatTok->Previous;
const FormatToken *LeftSquare = FormatTok;
nextToken();
- if ((Previous && ((Previous->Tok.getIdentifierInfo() &&
- !Previous->isOneOf(tok::kw_return, tok::kw_co_await,
- tok::kw_co_yield, tok::kw_co_return)) ||
- Previous->closesScope())) ||
- LeftSquare->isCppStructuredBinding(IsCpp)) {
- return false;
+ if (Previous) {
+ if (Previous->Tok.getIdentifierInfo() &&
+ !Previous->isOneOf(tok::kw_return, tok::kw_co_await, tok::kw_co_yield,
+ tok::kw_co_return)) {
+ return false;
+ }
+ if (Previous->closesScope()) {
+ // Not a potential C-style cast.
+ if (Previous->isNot(tok::r_paren))
+ return false;
+ const auto *BeforeRParen = Previous->getPreviousNonComment();
+ // Lambdas can be cast to function types only, e.g. `std::function<int()>`
+ // and `int (*)()`.
+ if (!BeforeRParen || !BeforeRParen->isOneOf(tok::greater, tok::r_paren))
+ return false;
+ }
}
+ if (LeftSquare->isCppStructuredBinding(IsCpp))
+ return false;
if (FormatTok->is(tok::l_square) || tok::isLiteral(FormatTok->Tok.getKind()))
return false;
if (FormatTok->is(tok::r_square)) {
diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp
index a6410f3..73858e8 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -2165,6 +2165,16 @@
// FIXME:
// EXPECT_TOKEN(Tokens[13], tok::l_paren, TT_LambdaDefinitionLParen);
EXPECT_TOKEN(Tokens[17], tok::l_brace, TT_LambdaLBrace);
+
+ Tokens = annotate("auto foo{(std::function<int()>)[] { return 0; }};");
+ ASSERT_EQ(Tokens.size(), 23u) << Tokens;
+ EXPECT_TOKEN(Tokens[13], tok::l_square, TT_LambdaLSquare);
+ EXPECT_TOKEN(Tokens[15], tok::l_brace, TT_LambdaLBrace);
+
+ Tokens = annotate("auto foo{(int (*)())[] { return 0; }};");
+ ASSERT_EQ(Tokens.size(), 21u) << Tokens;
+ EXPECT_TOKEN(Tokens[11], tok::l_square, TT_LambdaLSquare);
+ EXPECT_TOKEN(Tokens[13], tok::l_brace, TT_LambdaLBrace);
}
TEST_F(TokenAnnotatorTest, UnderstandsFunctionAnnotations) {